diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-13 07:24:47 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-13 08:27:51 (GMT) |
| commit | 13cbcc0ddca0fdd5be9ede09052d31785c1e4d55 (patch) | |
| tree | b647be5699145ccae1545096aba5c495d96f8eb5 /dist/changes-4.3.3 | |
| parent | 081078137a6fbc85d6be1437f6afc1d60e4f75f9 (diff) | |
| parent | de088b5a7f7b57e568399334667b14bfc9e7b893 (diff) | |
| download | Qt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.zip Qt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.tar.gz Qt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.tar.bz2 | |
Merge commit 'qt/master'
Conflicts:
examples/opengl/samplebuffers/glwidget.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/kernel/qobject.cpp
src/corelib/tools/qsharedpointer.cpp
src/gui/gui.pro
tests/auto/qhttp/tst_qhttp.cpp
tests/auto/qkeyevent/tst_qkeyevent.cpp
Diffstat (limited to 'dist/changes-4.3.3')
| -rw-r--r-- | dist/changes-4.3.3 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/changes-4.3.3 b/dist/changes-4.3.3 index 5bf6da0..7933426 100644 --- a/dist/changes-4.3.3 +++ b/dist/changes-4.3.3 @@ -17,7 +17,7 @@ General Improvements * This version adds the Common Development and Distribution License (CDDL) to the GPL Exception for developers using the Open Source Edition of Qt. - See the Trolltech GPL Exception Version 1.1 page in the documentation + See the GPL Exception Version 1.1 page in the documentation for more information. * This version upgrades the Qt Commercial License to version 3.4, the Qtopia Core Commercial License to 1.2 and the Qt Academic |