Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 28 Apr 2011 13:08:33 +0000 (15:08 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 28 Apr 2011 13:08:33 +0000 (15:08 +0200)
commit7e4abe3a5f512f1bec1c3220787d9d38f3203e22
treeb504f6a6f9ddbeca33ae4543ae486afc243c8df2
parent514641bed524337acbad3d386b913b0c795f4c47
parent07fa0ccfc458c217ba1c071784e980f65f404f84
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into qtquick2