Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Fri, 13 May 2011 13:57:35 +0000 (15:57 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Fri, 13 May 2011 13:57:35 +0000 (15:57 +0200)
commit0dbbb137f432e99113ac513c542b4a8431b00b5d
treed62a62e26841c54019c765ead734b27c12a142b2
parent23267553627ac3c4cbcd918283bee8e665deeff9
parentde1e529da4a3a042205808cc27e28157c409653b
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
tools/qdoc3/qdoc3.pro