Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
commitf65e60b49395d68be78259ec82c9969b267e591c
authorSimon Hausmann <simon.hausmann@nokia.com>
Tue, 28 Apr 2009 07:12:33 +0000 (28 09:12 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Tue, 28 Apr 2009 07:12:33 +0000 (28 09:12 +0200)
tree236dfd6d394d432a73092cb6dc7eb4749e5d48a6
parenta173e6a016897201bf2c1cf08ac756e9af8722ee
parent3c12dd749ff0d9747af416db68ba2447d36bf8aa
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf