diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-16 09:09:31 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-16 09:09:31 +1000 |
| commit | 5aa1cbcdacd19b2e526e358eddac1b7d55a994b5 (patch) | |
| tree | 4aba78405e3d98081662fcb934f673acd1b79d42 /doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp | |
| parent | 8592bcc80b7ec245b485fa54f8bd41c4484e93e0 (diff) | |
| parent | 7e4a9187bb11b794e45d95d2e9fae026d6b0d07d (diff) | |
| download | qt4-tools-5aa1cbcdacd19b2e526e358eddac1b7d55a994b5.tar.gz | |
Merge remote branch 'origin/4.8' into qa-review-master
Conflicts:
tests/auto/qaccessibility/tst_qaccessibility.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
Diffstat (limited to 'doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp')
0 files changed, 0 insertions, 0 deletions