summaryrefslogtreecommitdiff
path: root/mkspecs
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-22 18:50:49 +0200
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-22 18:50:49 +0200
commit4894e6dd57c31e0196c6fdae4d1b2fb16b9f1b16 (patch)
tree5920aa9d4a2d62670c7fdf29872685b94cc6bf5d /mkspecs
parent1c47be7174ca1e9ed393a12461742975079710d7 (diff)
parent70bafa8e138d938fd34736c46b015d88b5d7feef (diff)
downloadqt4-tools-4894e6dd57c31e0196c6fdae4d1b2fb16b9f1b16.tar.gz
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qdoc: Updated the extra images variable again, for each manual.qdocconf. Revert "Add new QDataStream version for Qt 4.8." Add new QDataStream version for Qt 4.8. Fix URL for Qt Bug Tracker.
Diffstat (limited to 'mkspecs')
0 files changed, 0 insertions, 0 deletions