summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-05 03:15:02 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-05 03:15:02 (GMT)
commitebecf192abe56c405409343acc2f97eaf9124fc3 (patch)
treef9a1c01e6a06dc51380eff2a010377a27cfcff10 /src/plugins
parentaba9a891da354a1fbbadbb3a70d90a66f47d3f1d (diff)
parentda8b7c8587a6d3c3214355f3d85a09c8693ceeee (diff)
downloadQt-ebecf192abe56c405409343acc2f97eaf9124fc3.zip
Qt-ebecf192abe56c405409343acc2f97eaf9124fc3.tar.gz
Qt-ebecf192abe56c405409343acc2f97eaf9124fc3.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation issue for the Carbon build.
Diffstat (limited to 'src/plugins')
0 files changed, 0 insertions, 0 deletions