Thumbnailer

Merge lp://staging/~michihenning/thumbnailer/back-merge into lp://staging/thumbnailer/devel

  1. back-merge
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: Michi Henning
Approved revision: 355
Merged at revision: 355
Proposed branch: lp://staging/~michihenning/thumbnailer/back-merge
Merge into: lp://staging/thumbnailer/devel
Diff against target: 1094 lines (+345/-225)
11 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+10/-0)
include/internal/imageextractor.h (+13/-0)
plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.cpp (+1/-1)
src/imageextractor.cpp (+102/-8)
src/thumbnailer.cpp (+11/-10)
src/vs-thumb/test-seq.cpp (+15/-38)
src/vs-thumb/thumbnailextractor.cpp (+36/-31)
src/vs-thumb/thumbnailextractor.h (+7/-4)
src/vs-thumb/vs-thumb.cpp (+68/-45)
tests/vs-thumb/vs-thumb_test.cpp (+81/-87)
To merge this branch: bzr merge lp://staging/~michihenning/thumbnailer/back-merge
Reviewer Review Type Date Requested Status
Michi Henning (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+291189@code.staging.launchpad.net

Commit message

Back-merge of 2.4+16.04.20160321-0ubuntu1 from trunk.

Description of the change

Back-merge of 2.4+16.04.20160321-0ubuntu1 from trunk.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:355
http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-ci/685/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-amd64-ci/389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-armhf-ci/390
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-armhf-ci/390/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-vivid-i386-ci/390
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-amd64-ci/139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-armhf-ci/140
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-armhf-ci/140/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-xenial-i386-ci/137

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-devel-ci/685/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

Top-approving myself, it's just the sync from the trunk.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: