Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
authorMartin Jones <martin.jones@nokia.com>
Mon, 1 Mar 2010 06:32:35 +0000 (16:32 +1000)
committerMartin Jones <martin.jones@nokia.com>
Mon, 1 Mar 2010 06:32:35 +0000 (16:32 +1000)
commit049330b4a54836f227a0e179082527a5272e868d
treeb33ce32ee9b86c4c6bf2e87cfd1c6d6f61bf2e2c
parentd5449c3cc85624b50e6a6fcabc6ad96b79d4bd0a
parentfa7053103f4aa528972dc8766c05b5a1371b2bd8
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

Conflicts:
demos/declarative/flickr/mobile/ImageDetails.qml