diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-10-13 05:57:53 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-10-13 05:57:53 (GMT) |
| commit | 1db61e89cb96022a6f5bffdc698f1f4dd4400b68 (patch) | |
| tree | ebf3bc47c76a507b1718ccc27db9ec6c7572c6bf /doc/src/snippets/code | |
| parent | e10635d099ff09ae5a0ceff10b56d4f3c19f59f4 (diff) | |
| parent | 81142c25f01738dea784144fb2f186cb563cc2bd (diff) | |
| download | Qt-1db61e89cb96022a6f5bffdc698f1f4dd4400b68.zip Qt-1db61e89cb96022a6f5bffdc698f1f4dd4400b68.tar.gz Qt-1db61e89cb96022a6f5bffdc698f1f4dd4400b68.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlinfo.cpp
Diffstat (limited to 'doc/src/snippets/code')
0 files changed, 0 insertions, 0 deletions