Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Wed, 11 May 2011 09:11:51 +0000 (19:11 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Wed, 11 May 2011 09:11:51 +0000 (19:11 +1000)
commitad5aeed367849caf9506bb145e4300f3c0b23755
treeef84188f4188fd524bdc268313fe0938cf3d1c3d
parentfaed3a7914339c02411da35dd982302175274be3
parent4ff72975b6501a0003329bb8183479d4df5eda4d
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2