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-3.2.0-b1 | |
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-3.2.0-b1')
-rw-r--r-- | dist/changes-3.2.0-b1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/changes-3.2.0-b1 b/dist/changes-3.2.0-b1 index cdd3514..f544330 100644 --- a/dist/changes-3.2.0-b1 +++ b/dist/changes-3.2.0-b1 @@ -3,7 +3,7 @@ Qt 3.2 introduces new features as well as many improvements over the 3.1.x series. This file gives an overview of the main changes since version 3.1.2. For more details, see the online documentation which is included in this distribution. The documentation is also available -at http://doc.trolltech.com/ +at http://qt.nokia.com/doc/ The Qt version 3.2 series is binary compatible with the 3.1.x series. Applications compiled for 3.1 will continue to run with 3.2. |