Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAaron Kennedy <aaron.kennedy@nokia.com>
Thu, 9 Jun 2011 05:23:12 +0000 (15:23 +1000)
committerAaron Kennedy <aaron.kennedy@nokia.com>
Thu, 9 Jun 2011 05:23:12 +0000 (15:23 +1000)
commit7cf421d04d19441a6e17ab9460dc4560374a5bcc
tree18873dba15650288d4b375b24b4dddc9e61e3d56
parent9bcea0318cae2f7fbfd24195ff9272cb369cb6e5
parent283a37447b8c400957c4da7dda35a84ea86ac4ad
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
demos/declarative/minehunt/MinehuntCore/Explosion.qml
demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
demos/declarative/snake/content/Cookie.qml
demos/declarative/snake/content/Link.qml