Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorMartin Jones <martin.jones@nokia.com>
Tue, 10 May 2011 05:34:37 +0000 (15:34 +1000)
committerMartin Jones <martin.jones@nokia.com>
Tue, 10 May 2011 05:34:37 +0000 (15:34 +1000)
commitf9b198987d2c43395ab4e49532beefbdcf3d2153
treeec399ad07f5d1cd443fad5717c0f587e2235fb8a
parente7f900bdc67a2a3fda316037c264d419d1592494
parent3cfdb6da04deae9aae3391327e0b8f9cd53e58a3
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2