Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
authorMartin Jones <martin.jones@nokia.com>
Mon, 1 Mar 2010 03:56:02 +0000 (13:56 +1000)
committerMartin Jones <martin.jones@nokia.com>
Mon, 1 Mar 2010 03:56:02 +0000 (13:56 +1000)
commit9b54e9e7168cafd3885a0784dd24f74b8ad058ab
tree2464a4194ad9237494f5828a00321eadee1c1d4e
parent2c3cc70107d2a4ae32e092703dd6a7de734bee4a
parentb1e097af8c0537794a64cfacd23848f8a2a7f0ca
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
src/declarative/graphicsitems/qdeclarativegridview.cpp