diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-05-20 10:22:14 +0200 |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-05-20 10:22:14 +0200 |
| commit | d92b8e0fdcbfcad0c98b8c51fe2bd6451868af62 (patch) | |
| tree | 462bf65a95e6de5438c728cbf157994e9684cd37 /doc/src/snippets/sqldatabase/sqldatabase.cpp | |
| parent | eff255bd29a8cbd09494f9e9480c2e4b07869386 (diff) | |
| parent | a948c797e0c45c965ada005b34c274514a3c4d42 (diff) | |
| download | qt4-tools-d92b8e0fdcbfcad0c98b8c51fe2bd6451868af62.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
examples/declarative/toys/dynamicscene/qml/itemCreation.js
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.cpp')
0 files changed, 0 insertions, 0 deletions