Merge branch '4.5' of git@scm.dev.troll.no:qt/qt
commit1e4402497124f7e2c51793a58f03c2b98512f256
authorSimon Hausmann <simon.hausmann@nokia.com>
Tue, 24 Mar 2009 21:39:41 +0000 (24 22:39 +0100)
committerSimon Hausmann <simon.hausmann@nokia.com>
Tue, 24 Mar 2009 21:39:41 +0000 (24 22:39 +0100)
treeae8661247b40f4bdfd7958c5535abf0de3fe4f75
parent4710365249f35556d27e49b56be7fb4a667a096a
parentdb3c3ca5d4b746bedbc129b647a700df94562192
Merge branch '4.5' of git@scm.dev.troll.no:qt/qt
doc/src/designer-manual.qdoc
src/corelib/global/qglobal.cpp