diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-22 00:40:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-22 00:40:19 (GMT) |
| commit | 74d58874e5608190890c1e830fecba1951ea9afe (patch) | |
| tree | ad7127263eb0be087f9a63c44c35a5644294e744 /src/3rdparty/webkit/.gitignore | |
| parent | a12b94c9dd7fc7193c0b7464ca6ea522ef0235fb (diff) | |
| parent | 569860f721a30d5caad8ea1b55a3220f7e7f3d56 (diff) | |
| download | Qt-74d58874e5608190890c1e830fecba1951ea9afe.zip Qt-74d58874e5608190890c1e830fecba1951ea9afe.tar.gz Qt-74d58874e5608190890c1e830fecba1951ea9afe.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:
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 'src/3rdparty/webkit/.gitignore')
0 files changed, 0 insertions, 0 deletions