diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-13 05:55:33 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-13 05:55:33 (GMT) |
| commit | 18fca750131302f9b89081ebf50b12221c922f6f (patch) | |
| tree | 7d5e428f39cef9d97b228171e7fa576245d0425a /doc | |
| parent | 2f67ba6d618228946ce35364c32d89a49385166a (diff) | |
| parent | a3cfd5cd28c1450796f23a847afde0510171dd23 (diff) | |
| download | Qt-18fca750131302f9b89081ebf50b12221c922f6f.zip Qt-18fca750131302f9b89081ebf50b12221c922f6f.tar.gz Qt-18fca750131302f9b89081ebf50b12221c922f6f.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv
Conflicts:
src/declarative/canvas/qsimplecanvas_graphicsview.cpp
src/declarative/canvas/qsimplecanvas_p.h
src/declarative/util/qfxview.cpp
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions