summaryrefslogtreecommitdiffstats
path: root/tools/pixeltool
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-17 05:28:59 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-17 05:28:59 (GMT)
commite969212de0b2ac816a46db8897d54e9ed78d57b8 (patch)
treecb63c26476023c4f645f589d89790bc43328b469 /tools/pixeltool
parent80eb06b6e95ecf0b88534f15ddd9c6c892c08980 (diff)
parent349213b37901c832f941a45e5ea630eac2fd2f26 (diff)
downloadQt-e969212de0b2ac816a46db8897d54e9ed78d57b8.zip
Qt-e969212de0b2ac816a46db8897d54e9ed78d57b8.tar.gz
Qt-e969212de0b2ac816a46db8897d54e9ed78d57b8.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compilation of qdrawhelper.cpp with XLC 10
Diffstat (limited to 'tools/pixeltool')
0 files changed, 0 insertions, 0 deletions