summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-04 01:35:03 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-04 01:35:03 (GMT)
commitdf08e9135e4aec7ba9ff1e3519cc17cdebd97f6d (patch)
tree14fd0e0dc2b8e26e1a7f85915a531852ad35d566 /demos
parent10d35e53d97e32018ae20632b86c1261a474dc2a (diff)
parentae4e3e8bc4ea3238aec09fd8b37a04fdbf74fed3 (diff)
downloadQt-df08e9135e4aec7ba9ff1e3519cc17cdebd97f6d.zip
Qt-df08e9135e4aec7ba9ff1e3519cc17cdebd97f6d.tar.gz
Qt-df08e9135e4aec7ba9ff1e3519cc17cdebd97f6d.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: Phonon; Use correct Phonon version numbers.
Diffstat (limited to 'demos')
0 files changed, 0 insertions, 0 deletions