Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
authorAlan Alpert <alan.alpert@nokia.com>
Thu, 25 Nov 2010 05:34:16 +0000 (15:34 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Thu, 25 Nov 2010 05:34:16 +0000 (15:34 +1000)
commit444d931b7ca2d8772054d795e0573384342b58dd
tree0587d65ad5b8c7e2c80dfac0051174b9248e1e03
parent852f4811453cb0b082748f2fcefac5898e603ab0
parent9e353ea7a1fedd020d39e83322286931f536dc16
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7