Merge lp://qastaging/~robert-ancell/indicator-bluetooth/dont-hide-on-rfkill into lp://qastaging/indicator-bluetooth/14.04
Proposed by
Sir Charlemagne
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~robert-ancell/indicator-bluetooth/dont-hide-on-rfkill |
| Merge into: | lp://qastaging/indicator-bluetooth/14.04 |
| Diff against target: |
427 lines (+411/-0) (has conflicts) 1 file modified
src/service.vala (+411/-0) Text conflict in src/service.vala |
| To merge this branch: | bzr merge lp://qastaging/~robert-ancell/indicator-bluetooth/dont-hide-on-rfkill |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Charles Kerr (community) | Needs Fixing | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 51. By Robert Ancell
-
Show the bluetooth indicator if bluetooth is disabled - assume there are devices present
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This MR has conflicts with trunk and appears to reintroduce a Gnome dependency, even on the phone...?