summaryrefslogtreecommitdiffstats
path: root/src/plugins/phonon
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-26 19:59:19 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-26 19:59:19 (GMT)
commit2925995de32f76a72fcdd7d577e609a68a517fa1 (patch)
tree0c2c728f961b7ecd23482f5e568d18283b93c370 /src/plugins/phonon
parentc52ed680fddab0f41bbc050fd3992bfc1ddc4bff (diff)
parent5f7e7f41abbb8ab2f2e8f076e0a1a5a2bad0c520 (diff)
downloadQt-2925995de32f76a72fcdd7d577e609a68a517fa1.zip
Qt-2925995de32f76a72fcdd7d577e609a68a517fa1.tar.gz
Qt-2925995de32f76a72fcdd7d577e609a68a517fa1.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Doc : Fixing typo.
Diffstat (limited to 'src/plugins/phonon')
0 files changed, 0 insertions, 0 deletions