diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-03 08:46:42 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-03 08:46:42 (GMT) |
| commit | 3838762e4b572017efc42e9f7dbfc43d262807cf (patch) | |
| tree | ebd9533ac4474c254be3acd8ebdc92ba9b0a390d /src/declarative/graphicsitems/qmlgraphicsitem.cpp | |
| parent | 348675876dfacb6cdd2373a1a4ae9d814e057df2 (diff) | |
| parent | 8003041739f2ec101bf8198f6a53375ce0112eb1 (diff) | |
| download | Qt-3838762e4b572017efc42e9f7dbfc43d262807cf.zip Qt-3838762e4b572017efc42e9f7dbfc43d262807cf.tar.gz Qt-3838762e4b572017efc42e9f7dbfc43d262807cf.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlengine.cpp
Diffstat (limited to 'src/declarative/graphicsitems/qmlgraphicsitem.cpp')
0 files changed, 0 insertions, 0 deletions