Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
authorWarwick Allison <warwick.allison@nokia.com>
Wed, 31 Mar 2010 23:44:10 +0000 (09:44 +1000)
committerWarwick Allison <warwick.allison@nokia.com>
Wed, 31 Mar 2010 23:44:10 +0000 (09:44 +1000)
commit5c32e4129e331a95187b65c2ab16074d21d8d96f
treeb86b6297b83f95860c7402b879e9b4691f485070
parent1bb04f8c0675449a851cf636680951bd0a142507
parent5fd91a33ddfb9d8419eb7b3592087e9b5d15df58
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7