diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-12 23:46:39 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-12 23:46:39 (GMT) |
| commit | 4ca1f77ab54f1e02045dc7e680bd99103f680fea (patch) | |
| tree | 3d947d55e6d2c75faf263d555d5237bb73c59582 /src/declarative/qml/qmlengine.h | |
| parent | 5b56189c9a6c322fa595b716a9f17e39a35bcbc0 (diff) | |
| parent | 66c9d55e58fd9ee9a80270e63a8ebba52db00904 (diff) | |
| download | Qt-4ca1f77ab54f1e02045dc7e680bd99103f680fea.zip Qt-4ca1f77ab54f1e02045dc7e680bd99103f680fea.tar.gz Qt-4ca1f77ab54f1e02045dc7e680bd99103f680fea.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlscriptparser.cpp
src/declarative/qml/qmlscriptparser_p.h
Compiles, but probably next needs a revert/change of module stuff,
since that work seems to have been duplicated.
Diffstat (limited to 'src/declarative/qml/qmlengine.h')
0 files changed, 0 insertions, 0 deletions