diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-27 07:40:38 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-27 07:40:38 (GMT) |
| commit | e4feb707118947feea8568a82d57a8db6ae59410 (patch) | |
| tree | ecf77b7d677f174b59e1c5110dd7aebee877f02d /doc/src/snippets/sqldatabase/sqldatabase.pro | |
| parent | 85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34 (diff) | |
| parent | 2925995de32f76a72fcdd7d577e609a68a517fa1 (diff) | |
| download | Qt-e4feb707118947feea8568a82d57a8db6ae59410.zip Qt-e4feb707118947feea8568a82d57a8db6ae59410.tar.gz Qt-e4feb707118947feea8568a82d57a8db6ae59410.tar.bz2 | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
src/corelib/global/qglobal.h
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.pro')
0 files changed, 0 insertions, 0 deletions