Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60
authoraxis <qt-info@nokia.com>
Fri, 21 Aug 2009 13:48:44 +0000 (15:48 +0200)
committeraxis <qt-info@nokia.com>
Fri, 21 Aug 2009 13:48:44 +0000 (15:48 +0200)
commitafd7cfce7333635edc8d3637f81cc9c3023ee874
tree433345bd8cfd4a2c057a24ee3c906d274d6282ca
parent044680951401487590c0ed554092dd9b7e0ee783
parent3513c1a01b319fb5fd4057be306c9f9506f8223d
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60

Conflicts:
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/plugin/qlibrary.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/io/qfsfileengine_win.cpp
src/corelib/plugin/qlibrary.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp