diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-13 00:30:00 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-13 00:30:00 (GMT) |
| commit | 2b64519c05edab3678fea2f56bba82077e5fedd1 (patch) | |
| tree | a817294b6c1909a214bfc0b50315748c33c34baf /tests/auto/declarative/qmlparser/duplicateIDs.errors.txt | |
| parent | 1d11153b5564deb06d9f2936e0e43a0700a0e359 (diff) | |
| parent | b417ed17f15d88eeac21c46fa666af37b69d4531 (diff) | |
| download | Qt-2b64519c05edab3678fea2f56bba82077e5fedd1.zip Qt-2b64519c05edab3678fea2f56bba82077e5fedd1.tar.gz Qt-2b64519c05edab3678fea2f56bba82077e5fedd1.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
tests/auto/declarative/qmlparser/tst_qmlparser.cpp
Diffstat (limited to 'tests/auto/declarative/qmlparser/duplicateIDs.errors.txt')
0 files changed, 0 insertions, 0 deletions