Merge lp://qastaging/~unity-team/unity-control-center/x-sru3 into lp://qastaging/unity-control-center
Proposed by
Marco Trevisan (Treviño)
Status: | Merged |
---|---|
Merge reported by: | Marco Trevisan (Treviño) |
Merged at revision: | not available |
Proposed branch: | lp://qastaging/~unity-team/unity-control-center/x-sru3 |
Merge into: | lp://qastaging/unity-control-center |
Diff against target: |
133 lines (+54/-5) (has conflicts) 4 files modified
debian/changelog (+31/-0) debian/control (+1/-1) panels/appearance/cc-appearance-panel.c (+21/-3) panels/info/cc-info-panel.c (+1/-1) Text conflict in debian/changelog |
To merge this branch: | bzr merge lp://qastaging/~unity-team/unity-control-center/x-sru3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Needs Fixing | ||
Review via email: mp+299173@code.qastaging.launchpad.net |
Commit message
Releasing Xenial SRU3
To post a comment you must log in.
thanks, looks fine but there is a merge conflict in the changelog, it should also probably target lp:unity-control-center/16.04 and not trunk