Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorEckhart Koppen <eckhart.koppen@nokia.com>
Fri, 13 May 2011 20:00:00 +0000 (23:00 +0300)
committerEckhart Koppen <eckhart.koppen@nokia.com>
Fri, 13 May 2011 20:00:00 +0000 (23:00 +0300)
commit6f2c2b5dbebe45fa58a2d6c5e927a66229384557
tree12d428bfcc3ae82a2aa84fca3b9a39b569d23a6d
parenta19095730ee39a8b45edc1ae12b3adab6d0c5459
parent367a4fb872c1836f08b2b272b58396114040165d
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2