Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
authorMiikka Heikkinen <miikka.heikkinen@digia.com>
Thu, 10 Sep 2009 08:39:39 +0000 (11:39 +0300)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>
Thu, 10 Sep 2009 08:39:39 +0000 (11:39 +0300)
commit0adc0bc91d0745177a30ce5899583f5e127d01b9
tree3633014fced73a982a169ff34f5a26ba8f5210fa
parent27d3905f3d08ef0498ceba1eeb367403cf9f2980
parent87fd237f2857e0d988a476731662a34c6bf045b3
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
src/corelib/io/qfsfileengine.cpp
src/corelib/kernel/qcoreapplication.cpp
src/corelib/plugin/qpluginloader.cpp