Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/xmlpatterns/data/qatomicmathematicians_p.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the QtXmlPatterns module of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    7171     *
    7272     * @ingroup Patternist_xdm
    73      * @author Frans Englich <fenglich@trolltech.com>
     73     * @author Frans Englich <f.com>
    7474     */
    7575    class DecimalMathematician : public AtomicMathematician
    … …  
    9191     *
    9292     * @ingroup Patternist_xdm
    93      * @author Frans Englich <fenglich@trolltech.com>
     93     * @author Frans Englich <f.com>
    9494     */
    9595    class IntegerMathematician : public AtomicMathematician
    … …  
    112112     *
    113113     * @ingroup Patternist_xdm
    114      * @author Frans Englich <fenglich@trolltech.com>
     114     * @author Frans Englich <f.com>
    115115     */
    116116    class DurationNumericMathematician : public AtomicMathematician
    … …  
    133133     *
    134134     * @ingroup Patternist_xdm
    135      * @author Frans Englich <fenglich@trolltech.com>
     135     * @author Frans Englich <f.com>
    136136     */
    137137    class DurationDurationDivisor : public AtomicMathematician
    … …  
    149149     *
    150150     * @ingroup Patternist_xdm
    151      * @author Frans Englich <fenglich@trolltech.com>
     151     * @author Frans Englich <f.com>
    152152     */
    153153    class DurationDurationMathematician : public AtomicMathematician
    … …  
    176176     *
    177177     * @ingroup Patternist_xdm
    178      * @author Frans Englich <fenglich@trolltech.com>
     178     * @author Frans Englich <f.com>
    179179     */
    180180    class OperandSwitcherMathematician : public AtomicMathematician
    … …  
    206206     *
    207207     * @ingroup Patternist_xdm
    208      * @author Frans Englich <fenglich@trolltech.com>
     208     * @author Frans Englich <f.com>
    209209     */
    210210    class DateTimeDurationMathematician : public AtomicMathematician
    … …  
    231231     *
    232232     * @ingroup Patternist_xdm
    233      * @author Frans Englich <fenglich@trolltech.com>
     233     * @author Frans Englich <f.com>
    234234     */
    235235    class AbstractDateTimeMathematician : public AtomicMathematician
Note: See TracChangeset for help on using the changeset viewer.