summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-17 11:44:38 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-17 11:44:38 (GMT)
commit4c1f54097a1fb1acff817ba8caa8af347ae56cd2 (patch)
tree86d2100d91a979b8bea80e2799f5f4a649418481 /src/multimedia/audio
parented08d67fea713e550da0fd0542672cc4443806e2 (diff)
parent5ecdb1a77b06956d3475f7d19dc573815233595a (diff)
downloadQt-4c1f54097a1fb1acff817ba8caa8af347ae56cd2.zip
Qt-4c1f54097a1fb1acff817ba8caa8af347ae56cd2.tar.gz
Qt-4c1f54097a1fb1acff817ba8caa8af347ae56cd2.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: add default values to parameter of virtual methods in QProxyModel
Diffstat (limited to 'src/multimedia/audio')
0 files changed, 0 insertions, 0 deletions