summaryrefslogtreecommitdiffstats
path: root/demos/qmediaplayer/mediaplayer.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-08 04:50:54 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-08 04:50:54 +1000
commit0b6ab62b87aaaf362c4ac33f568bd21488e75117 (patch)
treea3b4b88aa2884b868780deadbb29145b03e2302d /demos/qmediaplayer/mediaplayer.cpp
parente49b63f0ff2ceb8e472116a1a89c9122baff4974 (diff)
parentbe54e6f9b8df491920c4b6614e67c48acc65a2c1 (diff)
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging: Fix usage of QT_SOURCE_TREE
Diffstat (limited to 'demos/qmediaplayer/mediaplayer.cpp')
0 files changed, 0 insertions, 0 deletions