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

Proposed by Michi Henning
Status: Merged
Approved by: Michi Henning
Approved revision: no longer in the source branch.
Merged at revision: 353
Proposed branch: lp://staging/~michihenning/thumbnailer/back-merge
Merge into: lp://staging/thumbnailer/devel
Diff against target: 31 lines (+12/-2)
2 files modified
debian/changelog (+12/-0)
include/internal/image.h (+0/-2)
To merge this branch: bzr merge lp://staging/~michihenning/thumbnailer/back-merge
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michi Henning (community) Approve
Review via email: mp+288039@code.staging.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Michi Henning (michihenning) wrote :

Back-merge from trunk, top-approving myself.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
353. By Michi Henning

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

Approved by PS Jenkins bot, Michi Henning.

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: