Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Thu, 9 Jun 2011 09:49:09 +0000 (11:49 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Thu, 9 Jun 2011 09:49:09 +0000 (11:49 +0200)
commitd68bac1ad31c449b8ea146e2a2fefd5e47b57fe3
treeccc65030f312a51f918fa7e441a9106c283425cb
parent0c62d147c21da6f0b812820944fbb2a63cea1e4a
parentbcea4e3bcefd5dd95e71b4ed3f272f8bf32e776d
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/generator.cpp