diff options
| author | axis <qt-info@nokia.com> | 2009-05-25 11:26:23 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-25 11:26:23 (GMT) |
| commit | de01a7e1e827ee7df035e0b32166db2263712e63 (patch) | |
| tree | 3a5cda42d360c63c027afd80eb2e6715faa72aaa /dist | |
| parent | 4c06cd950d27ba10d2288d508cbaef4e44abee91 (diff) | |
| parent | 44d992ca150d9448cb7b9114b2bc489b441c7b76 (diff) | |
| download | Qt-de01a7e1e827ee7df035e0b32166db2263712e63.zip Qt-de01a7e1e827ee7df035e0b32166db2263712e63.tar.gz Qt-de01a7e1e827ee7df035e0b32166db2263712e63.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/corelib/io/qfile.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/network/socket/qnativesocketengine_p.h
src/network/socket/qnativesocketengine_unix.cpp
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-4.5.2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dist/changes-4.5.2 b/dist/changes-4.5.2 index b3e808f..1e00208 100644 --- a/dist/changes-4.5.2 +++ b/dist/changes-4.5.2 @@ -42,8 +42,8 @@ Third party components Memory (r41527, r43764, r43828, r43830) JavaScript (r39882, r40086, r40131, r40133) Rendering (r41285, r41296, r41659, r42887) - Network (r41664, r42516) - Plugins (r41346, r43550) + Network (r41664, r42516, r42747) + Plugins (r41346, r43550, r43915, r43917, r43923) Clipboard (r41360) **************************************************************************** |