summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/gstreamer/devicemanager.cpp
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-03-30 13:03:14 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-03-30 13:03:14 (GMT)
commit429b747d492ef038c2ed58a9a72060d951721252 (patch)
tree2c96e795e4f3ea8aa7eddc6306fba903ef4019fa /src/3rdparty/phonon/gstreamer/devicemanager.cpp
parent853894dca607a0266f3c6d23c937dd5f55e551af (diff)
parentb73fa21a343e0e8f6a7c2cb1d07eaff644481c44 (diff)
downloadQt-429b747d492ef038c2ed58a9a72060d951721252.zip
Qt-429b747d492ef038c2ed58a9a72060d951721252.tar.gz
Qt-429b747d492ef038c2ed58a9a72060d951721252.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/3rdparty/phonon/gstreamer/devicemanager.cpp')
0 files changed, 0 insertions, 0 deletions