Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Wed, 4 May 2011 08:01:30 +0000 (10:01 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Wed, 4 May 2011 08:01:30 +0000 (10:01 +0200)
commita41265a09ea2816706bc2d87e9857a8cb5f1de75
treeb3174ef11f11684f86d60eb066473a6bea6df15a
parent539602d43a7214d4dbd182a629c5142af658129f
parent5bf2f85953a1df33ec942e49a9f72e0d9742bd54
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into qtquick2