diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-07 22:48:49 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-07 22:48:49 +1000 |
commit | 2608d28edb8eeed925be89a6adc563287d12fbb2 (patch) | |
tree | 31f67bb4bbbfe2ed01ade9676b071450908161d9 /src/3rdparty/harfbuzz/src/harfbuzz-thai.c | |
parent | 8a390046adddb8df3ddcf3a421f6f547e6cfe7aa (diff) | |
parent | ec31c6e5294285d0dc8e96d30d1300cfd1b0e96a (diff) |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert "Fix sqlite driver memory eating due to close failure"
Diffstat (limited to 'src/3rdparty/harfbuzz/src/harfbuzz-thai.c')
0 files changed, 0 insertions, 0 deletions