summaryrefslogtreecommitdiffstats
path: root/demos/multimedia/player/player.cpp
diff options
context:
space:
mode:
authorNicholas Young <nicholas.young@nokia.com>2010-02-23 03:37:48 (GMT)
committerNicholas Young <nicholas.young@nokia.com>2010-02-23 03:37:48 (GMT)
commit20a2a101e37b74e085f53a925477714bcff6cef9 (patch)
tree377c35e8ad70e31d18abd1e21c5f52dd057e65ee /demos/multimedia/player/player.cpp
parentf56a36d771bb71fe6d0f7025ae427a76a1d22324 (diff)
parent4b1a9e65bb989e7edcaa0bc0be9924885e7e06c9 (diff)
downloadQt-20a2a101e37b74e085f53a925477714bcff6cef9.zip
Qt-20a2a101e37b74e085f53a925477714bcff6cef9.tar.gz
Qt-20a2a101e37b74e085f53a925477714bcff6cef9.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging
Diffstat (limited to 'demos/multimedia/player/player.cpp')
0 files changed, 0 insertions, 0 deletions