diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-26 01:29:32 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-26 01:29:32 +0200 |
| commit | 23e03ee30dcd140a51073a0dd665bd871927d05e (patch) | |
| tree | 33996e308999b64bcee64ddded2e609e66cace77 /src/gui/text/qfontengine_p.h | |
| parent | 1308b32a1a3e36c5b2788ad4f701a0203b876484 (diff) | |
| parent | f0d257ae6ab3e1ec7c5dfb1ea646e5c824e437de (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix problems in QTextureGlyphCache caused by insufficient merge
Diffstat (limited to 'src/gui/text/qfontengine_p.h')
0 files changed, 0 insertions, 0 deletions