diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-16 21:55:23 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-16 21:55:23 (GMT) |
| commit | 1f5e32a11114370e4364fcfa77b9c4ab4bf192a3 (patch) | |
| tree | 5761a1e1d6dfac01c50d1c91187c20378383fe6f /examples/statemachine | |
| parent | f60dea8315fef502f6f4c6941455a51bee66efd9 (diff) | |
| parent | 6470f646d0815f67bab507c1362cdda775c42a6e (diff) | |
| download | Qt-1f5e32a11114370e4364fcfa77b9c4ab4bf192a3.zip Qt-1f5e32a11114370e4364fcfa77b9c4ab4bf192a3.tar.gz Qt-1f5e32a11114370e4364fcfa77b9c4ab4bf192a3.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv
Conflicts:
src/declarative/fx/qfxitem.h
src/declarative/util/qfxview.h
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'examples/statemachine')
0 files changed, 0 insertions, 0 deletions