diff options
| author | Bill King <bill.king@nokia.com> | 2009-07-08 22:41:01 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-07-08 22:41:01 (GMT) |
| commit | 7b980974b14d246f60d824bab4e069ac8cc2da29 (patch) | |
| tree | 68f0d1667760a0e7e27d57fc76c0434dc028502c /tests/auto/uiloader | |
| parent | cfacb284593008094136905a2497843a4bbac639 (diff) | |
| parent | 48f049d6fbddd60d99fb6ebc15fd5b52a3b515ec (diff) | |
| download | Qt-7b980974b14d246f60d824bab4e069ac8cc2da29.zip Qt-7b980974b14d246f60d824bab4e069ac8cc2da29.tar.gz Qt-7b980974b14d246f60d824bab4e069ac8cc2da29.tar.bz2 | |
Merge commit 'origin/4.5'
Conflicts:
src/sql/drivers/ibase/qsql_ibase.cpp
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qsqldatabase/tst_databases.h
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
translations/qt_ru.ts
Diffstat (limited to 'tests/auto/uiloader')
0 files changed, 0 insertions, 0 deletions