summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-11-05 10:32:55 (GMT)
committeraxis <qt-info@nokia.com>2009-11-05 10:32:55 (GMT)
commitdd6a230f812b957137a2711c772284ee77ffccf4 (patch)
treea1f46718a295964ddaa9ab04c8222f6db3b19057 /src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
parentf1a56f4db2f6d6c395ac6e7023b6e9184140d571 (diff)
parenteb75d1d6acf121fc08a591b4d6b34f1f39283bc2 (diff)
downloadQt-dd6a230f812b957137a2711c772284ee77ffccf4.zip
Qt-dd6a230f812b957137a2711c772284ee77ffccf4.tar.gz
Qt-dd6a230f812b957137a2711c772284ee77ffccf4.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
index 408478c..09dfae5 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
+++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
@@ -31,7 +31,7 @@
the module under the appropriate version of the GNU LGPL; version 2.1
for applications and libraries licensed under the GNU GPL version 2,
or version 3 for applications and libraries licensed under the GNU
- GPL version 3.
+ GPL version 2.
\legalese
WebKit is licensed under the GNU Library General Public License.