Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
authorDavid Boddie <dboddie@trolltech.com>
Wed, 30 Jun 2010 17:06:37 +0000 (19:06 +0200)
committerDavid Boddie <dboddie@trolltech.com>
Wed, 30 Jun 2010 17:06:37 +0000 (19:06 +0200)
commit0713442baa4120050e85c13998797415bb40efce
tree2735cae5573363fd5edceae71ae8b7af60518df2
parent08478207ee9a6563ae63ebcef833925db6426bd8
parent01648005f1f546dc0281155fecd94b4f47a94584
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7

Conflicts:
tools/qdoc3/test/qt-html-templates.qdocconf