diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-11 06:36:42 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-11 06:36:42 (GMT) |
| commit | bb37512280e5710c1c395056bbecf4f0e4289fb9 (patch) | |
| tree | 80b284f85dcd18ccb03d748dbca0467a525a0338 /src/declarative/qml/qmlcustomparser.cpp | |
| parent | 3f85913faf5694e4a0ebd612921e4eeeb4fc9e25 (diff) | |
| parent | b3526f5edf6425289ef2aa5c8adfc89892817ac0 (diff) | |
| download | Qt-bb37512280e5710c1c395056bbecf4f0e4289fb9.zip Qt-bb37512280e5710c1c395056bbecf4f0e4289fb9.tar.gz Qt-bb37512280e5710c1c395056bbecf4f0e4289fb9.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp
Diffstat (limited to 'src/declarative/qml/qmlcustomparser.cpp')
0 files changed, 0 insertions, 0 deletions