Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Fri, 5 Nov 2010 16:03:09 +0000 (17:03 +0100)
committerDavid Boddie <david.boddie@nokia.com>
Fri, 5 Nov 2010 16:03:09 +0000 (17:03 +0100)
commit915aa77e130e4722173df10e7bb6816c54a2c4e4
tree3ed88b481d7561b304202378e42735d28f43b3bc
parent00b2c14a9031023da89484aea1483fd0fb7be863
parente2e4fda34680cd6f6bcda877281abb8eed39df4d
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
tools/qdoc3/htmlgenerator.cpp