Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
authorDavid Boddie <dboddie@trolltech.com>
Fri, 2 Jul 2010 16:23:48 +0000 (18:23 +0200)
committerDavid Boddie <dboddie@trolltech.com>
Fri, 2 Jul 2010 16:23:48 +0000 (18:23 +0200)
commit19c5e5e8ffc158a4008292a23bbf5e3ab30543aa
treed2ff98f4165a23f73702df2178074479873e4821
parent12f64cce218a5bf76372dd48d54f9fa761fe2955
parent8577353b2a5155600e672955e7c6a61e9e9519ca
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

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