| commit | 00aeefeeaff4d8c3e25c6f388c5e51c239541f87 | |
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | |
| Mon, 9 Nov 2009 11:34:59 +0000 (9 12:34 +0100) | ||
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | |
| Mon, 9 Nov 2009 11:34:59 +0000 (9 12:34 +0100) | ||
| tree | 265f1ff24e1628b8974b96ec1858cb462d4e4b3e | treesnapshot (tar.gz zip) |
| parent | 9b7a5241a287b71c1ab4a9cd9cd3d89c03136ced | commitdiff |
| parent | b65fd82299689a1f353e16caa7d1c896b838762a | commitdiff |
Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6
Conflicts:
configure.exe
src/corelib/io/qfsfileengine.cpp
tests/auto/qfile/tst_qfile.cpp
Conflicts:
configure.exe
src/corelib/io/qfsfileengine.cpp
tests/auto/qfile/tst_qfile.cpp