Merge lp://qastaging/~ralsina/ubuntuone-control-panel/darwicon into lp://qastaging/ubuntuone-control-panel
Proposed by
Roberto Alsina
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Mike McCracken | ||||
| Approved revision: | 355 | ||||
| Merged at revision: | 355 | ||||
| Proposed branch: | lp://qastaging/~ralsina/ubuntuone-control-panel/darwicon | ||||
| Merge into: | lp://qastaging/ubuntuone-control-panel | ||||
| Diff against target: |
69 lines (+22/-1) 2 files modified
ubuntuone/controlpanel/gui/qt/main/__init__.py (+3/-1) ubuntuone/controlpanel/gui/qt/main/tests/test_main.py (+19/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~ralsina/ubuntuone-control-panel/darwicon | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mike McCracken (community) | Approve | ||
| dobey (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Made --with-icon the default on Darwin
Description of the change
Make --with-icon the default on Darwin, since there we can't control how u1cp is started.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks fine to me.