diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-22 09:47:11 +0100 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-22 09:47:11 +0100 |
| commit | d097610e5cddf946b2c16aa68acc6ebd07aa2f44 (patch) | |
| tree | f558fee4620bab560c8885b3c1d0c70462978664 /src/gui/text/qfontengine_win.cpp | |
| parent | 48f1ff3315f6d3fc05901ba6a83e02a79d9148fc (diff) | |
| parent | 6b366d4f26ed088f7edcc4b74f56cdbdc7a15024 (diff) | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed inconsistent test naming.
Diffstat (limited to 'src/gui/text/qfontengine_win.cpp')
0 files changed, 0 insertions, 0 deletions