Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
commit8b3df114cbb0f1961987b3660c1d51437dd911bf
authorSimon Hausmann <simon.hausmann@nokia.com>
Fri, 24 Apr 2009 10:45:19 +0000 (24 12:45 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Fri, 24 Apr 2009 10:45:19 +0000 (24 12:45 +0200)
tree2d8d576c9ffec2f3bd4a71c4f0263ade225d7987
parented3b35cff7ed7663971665e67d3a4037da8bd158
parent225b516ea21e841ee52d2f3edb426eb781ab0c8d
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf