← Back to branch summary

~ci-train-bot/thumbnailer/thumbnailer-ubuntu-wily-proposed

~ci-train-bot/thumbnailer/thumbnailer-ubuntu-wily-proposed

Viewing all changes in revision 104.

Committer: CI bot
Author(s): Pete Woods, Jussi Pakkanen, Pawel Stolowski
Date: 2014-09-26 11:25:07 UTC
mfrom: (103.2.10 devel)
Revision ID: ps-jenkins@lists.canonical.com-20140926112507-1g6j1c9q7ct3ipqc

Aggregate the various MRs, with conflicts resolved
Approved by: PS Jenkins bot

files added:
cmake/UseGSettings.cmake

data

data/CMakeLists.txt

data/album_missing.png

data/com.canonical.Unity.Thumbnailer.gschema.xml

data/thumbnailer.in

data/video_missing.png

debian/thumbnailer-common.install

tests/testimage_noexif.png

files modified:
CMakeLists.txt

debian/changelog

debian/control

debian/rules

debian/thumbnailer-service.install

include/internal/imagescaler.h

include/internal/ubuntuserverdownloader.h

plugins/Ubuntu/Thumbnailer/albumartgenerator.cpp

plugins/Ubuntu/Thumbnailer/artistartgenerator.cpp

plugins/Ubuntu/Thumbnailer/thumbnailgenerator.cpp

src/CMakeLists.txt

src/imagescaler.cpp

src/thumbnailcache.cpp

src/thumbnailer.cpp

src/ubuntuserverdownloader.cpp

src/videoscreenshotter.cpp

src/vs-thumb.cpp

tests/CMakeLists.txt

tests/basic.cpp

tests/download.cpp

Show diffs side-by-side

added added

removed removed

cmake/UseGSettings.cmake

data/CMakeLists.txt

data/album_missing.png

data/com.canonical.Unity.Thumbnailer.gschema.xml

data/thumbnailer.in

data/video_missing.png

debian/changelog

debian/thumbnailer-common.install

debian/thumbnailer-service.install

include/internal/imagescaler.h

include/internal/ubuntuserverdownloader.h

plugins/Ubuntu/Thumbnailer/albumartgenerator.cpp

plugins/Ubuntu/Thumbnailer/artistartgenerator.cpp

plugins/Ubuntu/Thumbnailer/thumbnailgenerator.cpp

src/CMakeLists.txt

src/imagescaler.cpp

src/thumbnailcache.cpp

src/thumbnailer.cpp

src/ubuntuserverdownloader.cpp

src/videoscreenshotter.cpp

src/vs-thumb.cpp

tests/CMakeLists.txt

tests/basic.cpp

tests/download.cpp

tests/testimage_noexif.png

Older »