Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
authorCasper van Donderen <casper.vandonderen@nokia.com>
Tue, 22 Nov 2011 16:02:57 +0000 (17:02 +0100)
committerCasper van Donderen <casper.vandonderen@nokia.com>
Tue, 22 Nov 2011 16:02:57 +0000 (17:02 +0100)
commit7f53a83a4761a90756003e68691a2959f3eb3c1a
tree2cd531b20e94f07082eb9f58d4e97f5d30d730e7
parent3d3b1a1549b18701a50d2da705d13368c35b4f38
parentc6b06f07d4fdd62698e91ece75acba1f2c1748cc
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging