diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-10-15 05:19:44 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-10-15 05:19:44 (GMT) |
| commit | 149750b60b99da47ccb22f22273c19bb4c2613ce (patch) | |
| tree | 102d3a198e88cd4e1dc3b0c76bb3b6d6cad004c5 /doc/src/snippets/code/doc_src_examples_activeqt_dotnet.qdoc | |
| parent | 0a0456bda6d730242267dec7dd6861702bab3877 (diff) | |
| parent | f410aa58f93b27a5ba1b82e2f3a87d14338e22a4 (diff) | |
| download | Qt-149750b60b99da47ccb22f22273c19bb4c2613ce.zip Qt-149750b60b99da47ccb22f22273c19bb4c2613ce.tar.gz Qt-149750b60b99da47ccb22f22273c19bb4c2613ce.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlinfo.cpp
Diffstat (limited to 'doc/src/snippets/code/doc_src_examples_activeqt_dotnet.qdoc')
0 files changed, 0 insertions, 0 deletions