Merge lp://staging/~fourdollars/indicator-power/xenial into lp://staging/indicator-power
Proposed by
Shih-Yuan Lee
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~fourdollars/indicator-power/xenial |
| Merge into: | lp://staging/indicator-power |
| Diff against target: |
464 lines (+158/-20) (has conflicts) 7 files modified
src/device-provider-upower.c (+5/-1) src/device.c (+37/-5) src/device.h (+4/-1) src/service.c (+18/-6) src/testing.c (+2/-1) tests/test-device.cc (+86/-3) tests/test-notify.cc (+6/-3) Text conflict in tests/test-device.cc |
| To merge this branch: | bzr merge lp://staging/~fourdollars/indicator-power/xenial |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Indicator Applet Developers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2017-01-05.
To post a comment you must log in.
Unmerged revisions
- 293. By Shih-Yuan Lee
-
Make device with power supply has higher sorting priority. (LP: #1100546)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
