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: | 351 |
Proposed branch: | lp://staging/~michihenning/thumbnailer/back-merge |
Merge into: | lp://staging/thumbnailer/devel |
Diff against target: |
48 lines (+18/-9) 2 files modified
debian/changelog (+14/-4) tests/qml/CMakeLists.txt (+4/-5) |
To merge this branch: | bzr merge lp://staging/~michihenning/thumbnailer/back-merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Michi Henning (community) | Approve | ||
Review via email:
|
Commit message
Back merge of 2.4+16.
Description of the change
Back merge of 2.4+16.
To post a comment you must log in.
Back-merge from trunk, top-approving myself.