Merge branch '4.7' of scm.dev.nokia.troll.no:qt/dboddies-oslo-staging-1-qdoc into 4.7
authorDavid Boddie <dboddie@trolltech.com>
Fri, 18 Jun 2010 11:34:11 +0000 (13:34 +0200)
committerDavid Boddie <dboddie@trolltech.com>
Fri, 18 Jun 2010 11:34:11 +0000 (13:34 +0200)
commit678d6044cb82b59e2a3747a24f5d70a58f5cf127
tree811af412e92ce107222f57e80816faab3963655b
parent68073bbcde2d1b12d36f0c58aab1fc20f02ab967
parent81b03ee252a22c9b053c376302428e5430523900
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/dboddies-oslo-staging-1-qdoc into 4.7
tools/qdoc3/node.cpp
tools/qdoc3/node.h