Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
authorMartin Jones <martin.jones@nokia.com>
Mon, 22 Feb 2010 09:00:29 +0000 (19:00 +1000)
committerMartin Jones <martin.jones@nokia.com>
Mon, 22 Feb 2010 09:00:29 +0000 (19:00 +1000)
commit6d23a6d0a2954a4895dd5c1cfade28eab5a2874e
treef2f1709febef96b8eec5fcf5f450abe50759a4c7
parent746be2ba8d54e2c9803af6a6ba3cc0b6bf1da258
parente2f90ecdde9550986df1539aa88eb5fc41d939e1
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml