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/doc/src/credits.qdoc

    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 documentation 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**
     
    189189    Jim Lauchlan <jim.lauchlan at gecm.com>\br
    190190    Joachim Backes <backes at rhrk.uni-kl.de>\br
    191     Jochen R&ouml;mmler <jochen at concept.de>\br
     191    Jochen Rmmler <jochen at concept.de>\br
    192192    Jochen Scharrlach <jscharrl at BA-Stuttgart.De>\br
    193193    Joe Croft <jcroft at swbell.net>\br
     
    248248    Mike Sharkey <msharkey at softarc.com>\br
    249249    Mikko Ala-Fossi <mikko.ala-fossi at vaisala.com>\br
     250
    250251    Miroslav Flidr <flidr at kky.zcu.cz>\br
    251252    Miyata Shigeru <miyata at kusm.kyoto-u.ac.jp>\br
Note: See TracChangeset for help on using the changeset viewer.