← Back to branch summary

~unity-team/unity-scope-mediascanner/albumresults

~unity-team/unity-scope-mediascanner/albumresults

Viewing all changes in revision 79.

Committer: Jussi Pakkanen
Date: 2014-03-12 09:59:21 UTC
mfrom: (60.1.7 unity-scope-mediascanner)
Revision ID: jussi.pakkanen@canonical.com-20140312095921-m80ksdmuer0316bz

Merged trunk.

files added:
data/mediascanner-music-screenshot.jpg

data/mediascanner-video-screenshot.jpg

data/music.png

data/musicaggregator-screenshot.jpg

data/video.png

data/videoaggregator-screenshot.jpg

src/bufferedresultforwarder.cpp

src/bufferedresultforwarder.h

src/onlinemusicresultforwarder.cpp

src/onlinemusicresultforwarder.h

files modified:
data/CMakeLists.txt

data/mediascanner-music.ini.in

data/mediascanner-video.ini.in

data/musicaggregator.ini.in

data/videoaggregator.ini.in

debian/changelog

debian/control

src/CMakeLists.txt

src/musicaggregatorquery.cpp

src/musicaggregatorscope.cpp

src/resultforwarder.cpp

src/resultforwarder.h

src/videoaggregatorquery.cpp

src/videoaggregatorscope.cpp

Show diffs side-by-side

added added

removed removed

data/CMakeLists.txt

data/mediascanner-music-screenshot.jpg

data/mediascanner-music.ini.in

data/mediascanner-video-screenshot.jpg

data/mediascanner-video.ini.in

data/musicaggregator-screenshot.jpg

data/musicaggregator.ini.in

data/videoaggregator-screenshot.jpg

data/videoaggregator.ini.in

debian/changelog

src/CMakeLists.txt

src/bufferedresultforwarder.cpp

src/bufferedresultforwarder.h

src/musicaggregatorquery.cpp

src/musicaggregatorscope.cpp

src/onlinemusicresultforwarder.cpp

src/onlinemusicresultforwarder.h

src/resultforwarder.cpp

src/resultforwarder.h

src/videoaggregatorquery.cpp

src/videoaggregatorscope.cpp

Older »