diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-08-27 23:59:22 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-08-27 23:59:22 (GMT) |
| commit | 41c9c45f766c187287c3107e8fb121610ccbf3b5 (patch) | |
| tree | eae3b22365c5dbdb3554b3ee98cd02deaac385b7 /doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp | |
| parent | 70e650500e6e13be336857dac17a110097da70ef (diff) | |
| parent | 1651d5d9109d60f9f6a63e18e31b59b90aeda6f8 (diff) | |
| download | Qt-41c9c45f766c187287c3107e8fb121610ccbf3b5.zip Qt-41c9c45f766c187287c3107e8fb121610ccbf3b5.tar.gz Qt-41c9c45f766c187287c3107e8fb121610ccbf3b5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlengine.cpp
Diffstat (limited to 'doc/src/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp')
0 files changed, 0 insertions, 0 deletions