summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-11-06 05:56:57 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-11-06 05:56:57 (GMT)
commit164f2b1e013adcf829cdfac2875ab25109a7c578 (patch)
tree072c58ae29329c2ba6a3d523d2260a720410dcfe /src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
parentb185b901ea31bfdc2db781e271132d34d0e8ce32 (diff)
parentfaa534e55b9a03dabc44565e45f2f19297edf29d (diff)
downloadQt-164f2b1e013adcf829cdfac2875ab25109a7c578.zip
Qt-164f2b1e013adcf829cdfac2875ab25109a7c578.tar.gz
Qt-164f2b1e013adcf829cdfac2875ab25109a7c578.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
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.