diff options
author | David Boddie <david.boddie@nokia.com> | 2010-09-13 16:05:08 +0200 |
---|---|---|
committer | David Boddie <david.boddie@nokia.com> | 2010-09-13 16:05:08 +0200 |
commit | 6cd8a6001fe87107d32524c6115d37b620d3e108 (patch) | |
tree | db8c882db3bf9dc359f39a6db514959efd5a1123 /doc/src/snippets/sqldatabase/sqldatabase.cpp | |
parent | e98161b0062169b533eb2e11567ba28165a1141c (diff) | |
parent | dfb50fd81e3dfb721cd60635c781125dbe42bfb1 (diff) | |
download | qt4-tools-6cd8a6001fe87107d32524c6115d37b620d3e108.tar.gz |
Merge branch 'fixesfor4.7' into 4.7
Conflicts:
examples/tutorials/modelview/3_changingmodel/mymodel.h
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.cpp')
0 files changed, 0 insertions, 0 deletions