diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-24 18:06:51 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-24 18:06:51 (GMT) |
| commit | f37c49985f2382b86fe91f7b7224c8fd92961ac9 (patch) | |
| tree | 9a05328fa1dc668a7d3d7143f99de39e5f795387 /tools/linguist/lrelease/lrelease.1 | |
| parent | 16b11332931caef92bd103d854fac4dff3ff771e (diff) | |
| parent | 534f5098c577f262b4b01d1c21cd0ec1af0f25f1 (diff) | |
| download | Qt-f37c49985f2382b86fe91f7b7224c8fd92961ac9.zip Qt-f37c49985f2382b86fe91f7b7224c8fd92961ac9.tar.gz Qt-f37c49985f2382b86fe91f7b7224c8fd92961ac9.tar.bz2 | |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8
Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
Diffstat (limited to 'tools/linguist/lrelease/lrelease.1')
| -rw-r--r-- | tools/linguist/lrelease/lrelease.1 | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/tools/linguist/lrelease/lrelease.1 b/tools/linguist/lrelease/lrelease.1 index 6197792..3a44a0e 100644 --- a/tools/linguist/lrelease/lrelease.1 +++ b/tools/linguist/lrelease/lrelease.1 @@ -7,29 +7,29 @@ .\" This file is part of the QtGui module of the Qt Toolkit. .\" .\" $QT_BEGIN_LICENSE:LGPL$ -.\" No Commercial Usage -.\" This file contains pre-release code and may not be distributed. -.\" You may use this file in accordance with the terms and conditions -.\" contained in the Technology Preview License Agreement accompanying -.\" this package. -.\" .\" GNU Lesser General Public License Usage -.\" Alternatively, this file may be used under the terms of the GNU Lesser -.\" General Public License version 2.1 as published by the Free Software -.\" Foundation and appearing in the file LICENSE.LGPL included in the -.\" packaging of this file. Please review the following information to -.\" ensure the GNU Lesser General Public License version 2.1 requirements -.\" will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +.\" This file may be used under the terms of the GNU Lesser General Public +.\" License version 2.1 as published by the Free Software Foundation and +.\" appearing in the file LICENSE.LGPL included in the packaging of this +.\" file. Please review the following information to ensure the GNU Lesser +.\" General Public License version 2.1 requirements will be met: +.\" http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. .\" .\" In addition, as a special exception, Nokia gives you certain additional -.\" rights. These rights are described in the Nokia Qt LGPL Exception +.\" rights. These rights are described in the Nokia Qt LGPL Exception .\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package. .\" -.\" If you have questions regarding the use of this file, please contact -.\" Nokia at qt-info@nokia.com. -.\" -.\" +.\" GNU General Public License Usage +.\" Alternatively, this file may be used under the terms of the GNU General +.\" Public License version 3.0 as published by the Free Software Foundation +.\" and appearing in the file LICENSE.GPL included in the packaging of this +.\" file. Please review the following information to ensure the GNU General +.\" Public License version 3.0 requirements will be met: +.\" http://www.gnu.org/copyleft/gpl.html. .\" +.\" Other Usage +.\" Alternatively, this file may be used in accordance with the terms and +.\" conditions contained in a signed written agreement between you and Nokia. .\" .\" .\" |