diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-09-23 01:44:14 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-09-23 01:44:14 (GMT) |
| commit | b9f7d5ebad998da0863e7f57cc1e5f1d3b6e673b (patch) | |
| tree | a1fc6a13d896327a44390c00c89ba8c4ad205234 /doc/src/snippets/sqldatabase/sqldatabase.pro | |
| parent | c60dfe1f2732670eb48d98c9772815d37a16ec3c (diff) | |
| parent | 1dfabbbb1b740060444a11cd894561aed3a884ad (diff) | |
| download | Qt-b9f7d5ebad998da0863e7f57cc1e5f1d3b6e673b.zip Qt-b9f7d5ebad998da0863e7f57cc1e5f1d3b6e673b.tar.gz Qt-b9f7d5ebad998da0863e7f57cc1e5f1d3b6e673b.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qml.pri
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.pro')
0 files changed, 0 insertions, 0 deletions