diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-31 23:50:07 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-31 23:50:07 (GMT) |
| commit | 205446535fb1436765dd33121dcd15ae917a1800 (patch) | |
| tree | 2e80e9708d4fdfe9b80b0b4ef45432770a76059a /tools/qmlviewer | |
| parent | b3489278b1c54ee5c15d103d45710195083fbd2b (diff) | |
| parent | 709c4df621f637bc81127e7c1a8bd59d0f2f04e4 (diff) | |
| download | Qt-205446535fb1436765dd33121dcd15ae917a1800.zip Qt-205446535fb1436765dd33121dcd15ae917a1800.tar.gz Qt-205446535fb1436765dd33121dcd15ae917a1800.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
Diffstat (limited to 'tools/qmlviewer')
0 files changed, 0 insertions, 0 deletions