Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
authorMartin Jones <martin.jones@nokia.com>
Tue, 7 Sep 2010 03:58:08 +0000 (13:58 +1000)
committerMartin Jones <martin.jones@nokia.com>
Tue, 7 Sep 2010 03:58:08 +0000 (13:58 +1000)
commit579e54d588bb435ecead39c38111747e948a7824
tree4f63ee59adb8eb123902a7f5e0574da38a22a178
parentd77ee9ad223c90cb5c690526632d978c0901d226
parent3113a91f50f12c8ee53f2e84f6b46fde6c2c1693
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7