Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
authorAlan Alpert <alan.alpert@nokia.com>
Thu, 1 Jul 2010 07:14:06 +0000 (17:14 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Thu, 1 Jul 2010 07:14:06 +0000 (17:14 +1000)
commit7e985adfbe41ee3cf92b7078e5423dfded1731f5
tree6a311a397decda9ae853aaf63a5aadd1f86e3185
parent38153cd6e94645ea21d037b2153d0b697c094949
parentc24f25fa537486c8c5e38ecfde490b7422a28f81
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7