diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-22 10:46:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-22 10:46:58 (GMT) |
| commit | fc48427e5f503b79e97e9607f1a281877817bc21 (patch) | |
| tree | 6acd8cf25db0932a82d98b6251fa70045e11d4c2 /translations/qtconfig_zh_CN.ts | |
| parent | 463ad12efcc43bd9b48ab9f502ec6810a47d3d85 (diff) | |
| parent | b4dd04f50b2e275ef9f8e643f33143d20a436203 (diff) | |
| download | Qt-fc48427e5f503b79e97e9607f1a281877817bc21.zip Qt-fc48427e5f503b79e97e9607f1a281877817bc21.tar.gz Qt-fc48427e5f503b79e97e9607f1a281877817bc21.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28
Clean up HB_Anchor's DeviceTables on failure when loading format 3
Make sure ValueRecord's DeviceTables are cleaned up on failure
Fix null HB_Device** dereference on exit in Harfbuzz GPOS code
Prevent warnings about EPOCROOT coming out when not on symbian
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b688e991a8405cf938dea9d6a2f1ac072
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( be1a105be93d7fcbe36d93d0827dc6e98b55de0c )
Diffstat (limited to 'translations/qtconfig_zh_CN.ts')
0 files changed, 0 insertions, 0 deletions