summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-18 16:25:55 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-18 16:25:55 (GMT)
commita27f18db247a0456ca15ad58f8dcc6b3441d55d0 (patch)
tree6e60b2067c95e9f78ab3b2acca826cde1ed35784 /src/gui
parent22ca911b4451401a9e0759b04248a58e7cd58f85 (diff)
parent2694a7b2b2b8293cf55ac9861b97bec1fc6650dd (diff)
downloadQt-a27f18db247a0456ca15ad58f8dcc6b3441d55d0.zip
Qt-a27f18db247a0456ca15ad58f8dcc6b3441d55d0.tar.gz
Qt-a27f18db247a0456ca15ad58f8dcc6b3441d55d0.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 5699175f55acbdfa4ac95ab6c727ebd4a201f3a2 Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a13977ce2aba31808a046cddc082a84dc316d78b ) Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 508b02a252b524d34f3ed970eef3bdb6350a2b77 Re-enable data structure packing in Harfbuzz for RVCT Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 85a48bdb52a81a9d18477a347fba5f6c930af416 )
Diffstat (limited to 'src/gui')
0 files changed, 0 insertions, 0 deletions