Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 4 May 2011 16:06:34 +0000 (02:06 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 4 May 2011 16:06:34 +0000 (02:06 +1000)
commitc1bbcda2cdd70d2a7a615bf823c55520914b90f5
tree518e4083d98579d29a09a751370eb78cfa02857f
parent0429ed6c8a5f679444ca87bdcbdfb0093d7699a3
parent9fdee69ef3d08f37a2a4f5daceb4606aa5c7ae9b
Merge branch 4.7 into qt-4.8-from-4.7
src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp