summaryrefslogtreecommitdiffstats
path: root/tests/auto/qsqlquery
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-09-15 23:21:11 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-09-15 23:21:11 (GMT)
commitd3b03a7d6c4ad023572d7099ee9f9ec3f0711d04 (patch)
tree5326031090ee5921eaf5c3259153194ddc352afc /tests/auto/qsqlquery
parent45c13a0064281d0e2b9a10c7dfb0cef7f3b6720f (diff)
parent669afa2337ad5791502fe3af2e3de648cb60ea9b (diff)
downloadQt-d3b03a7d6c4ad023572d7099ee9f9ec3f0711d04.zip
Qt-d3b03a7d6c4ad023572d7099ee9f9ec3f0711d04.tar.gz
Qt-d3b03a7d6c4ad023572d7099ee9f9ec3f0711d04.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts: configure.exe
Diffstat (limited to 'tests/auto/qsqlquery')
0 files changed, 0 insertions, 0 deletions