diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-10 14:58:17 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-10 14:58:17 (GMT) |
| commit | c3d2c4a7d103ec1289c27425f49f8565a7f4413c (patch) | |
| tree | ab77725bf74da5632bc5e9f7492a12759c1dfeaa /src/gui/math3d/qgenericmatrix.cpp | |
| parent | 0141b9b410278e064f3455d20cb21a50c926a2c8 (diff) | |
| parent | 32f32ee3e752a6cc03505ddaa48d2849eaedc2a6 (diff) | |
| download | Qt-c3d2c4a7d103ec1289c27425f49f8565a7f4413c.zip Qt-c3d2c4a7d103ec1289c27425f49f8565a7f4413c.tar.gz Qt-c3d2c4a7d103ec1289c27425f49f8565a7f4413c.tar.bz2 | |
Merge commit 'qt/master' into kinetic-declarativeui
Conflicts:
src/corelib/kernel/qabstractitemmodel.cpp
src/corelib/kernel/qobject.cpp
tools/qdoc3/htmlgenerator.cpp
Diffstat (limited to 'src/gui/math3d/qgenericmatrix.cpp')
| -rw-r--r-- | src/gui/math3d/qgenericmatrix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/math3d/qgenericmatrix.cpp b/src/gui/math3d/qgenericmatrix.cpp index 61df367..82be256 100644 --- a/src/gui/math3d/qgenericmatrix.cpp +++ b/src/gui/math3d/qgenericmatrix.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** -** This file is part of the $MODULE$ of the Qt Toolkit. +** This file is part of the QtGui module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage |