summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-08 02:09:02 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-08 02:09:02 (GMT)
commit6f5f6e1455162a890ff9ae0adaeab38216b7f103 (patch)
treefc00a95c731156bffa1af064578dfa3f501c2ea2 /mkspecs
parent3c61e1508c4d476b26246cadb2edc437a43f6560 (diff)
parent7b475f26b22f2fc400ecc7964438c8afc2cb912b (diff)
downloadQt-6f5f6e1455162a890ff9ae0adaeab38216b7f103.zip
Qt-6f5f6e1455162a890ff9ae0adaeab38216b7f103.tar.gz
Qt-6f5f6e1455162a890ff9ae0adaeab38216b7f103.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( b9dcd9c168d9b25deb020837a67f30c2d72c9afb ) Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 3bb0df4f00fa0b3ac3abc1b6fe508080fabdeaab ) Always construct s60 screen furniture even if not used. Change to release licenses for 4.6.3.
Diffstat (limited to 'mkspecs')
0 files changed, 0 insertions, 0 deletions