diff options
| author | axis <qt-info@nokia.com> | 2009-06-29 14:25:09 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-06-29 14:25:09 +0200 |
| commit | 1a8c89e9eaec05e9f38eae4fbc007d8344015de3 (patch) | |
| tree | d87e517cfab9443926841b3ef92ca715a717f54a /tests/auto/qsqlthread/qsqlthread.pro | |
| parent | 78166d5235a5045fdc887febe01d789cac333bb3 (diff) | |
| parent | b6171cfbe3b1453a2c46f78db0df4819e4e5e54f (diff) | |
| download | qt4-tools-1a8c89e9eaec05e9f38eae4fbc007d8344015de3.tar.gz | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
.gitignore
src/gui/dialogs/qfiledialog_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
tests/auto/network-settings.h
tests/auto/qitemdelegate/tst_qitemdelegate.cpp
Diffstat (limited to 'tests/auto/qsqlthread/qsqlthread.pro')
0 files changed, 0 insertions, 0 deletions