diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-25 23:29:32 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-25 23:29:32 (GMT) |
commit | 23e03ee30dcd140a51073a0dd665bd871927d05e (patch) | |
tree | 33996e308999b64bcee64ddded2e609e66cace77 /src/gui/itemviews/qtableview.cpp | |
parent | 1308b32a1a3e36c5b2788ad4f701a0203b876484 (diff) | |
parent | f0d257ae6ab3e1ec7c5dfb1ea646e5c824e437de (diff) | |
download | Qt-23e03ee30dcd140a51073a0dd665bd871927d05e.zip Qt-23e03ee30dcd140a51073a0dd665bd871927d05e.tar.gz Qt-23e03ee30dcd140a51073a0dd665bd871927d05e.tar.bz2 |
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/itemviews/qtableview.cpp')
0 files changed, 0 insertions, 0 deletions