diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-05 05:04:58 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-05 05:04:58 (GMT) |
| commit | 1490fdf8aaff2fa3f783bac4270e8c07ceaea304 (patch) | |
| tree | e06fe14864e3f884bf1230522c0b7060d0f3e560 /src/declarative/qml/qmlvme_p.h | |
| parent | 5343b49bbff4d813da1faf3fc4fc406441faccf0 (diff) | |
| parent | e4e3b8f336b6c7d0dd52d4b8af96fee1dc628783 (diff) | |
| download | Qt-1490fdf8aaff2fa3f783bac4270e8c07ceaea304.zip Qt-1490fdf8aaff2fa3f783bac4270e8c07ceaea304.tar.gz Qt-1490fdf8aaff2fa3f783bac4270e8c07ceaea304.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/graphicsitems/qmlgraphicsloader.cpp
Diffstat (limited to 'src/declarative/qml/qmlvme_p.h')
0 files changed, 0 insertions, 0 deletions