Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Mon, 23 May 2011 05:34:05 +0000 (15:34 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Mon, 23 May 2011 05:34:05 +0000 (15:34 +1000)
commit036cdbf1e128ecb4c5563087591958df93a52459
tree233ebb08486676aeb1006b32472712f5fff5cc08
parent72820b4c460d65237a014a0be074ec0a05af01ea
parent08fe14ab4113347cdf982fe11b9bc447bb0c168b
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2