Merge lp://qastaging/~mikemc/ubuntuone-control-panel/fix-1012887-controlpanel-darwin into lp://qastaging/ubuntuone-control-panel
Proposed by
Mike McCracken
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Roberto Alsina | ||||
| Approved revision: | 335 | ||||
| Merged at revision: | 332 | ||||
| Proposed branch: | lp://qastaging/~mikemc/ubuntuone-control-panel/fix-1012887-controlpanel-darwin | ||||
| Merge into: | lp://qastaging/ubuntuone-control-panel | ||||
| Diff against target: |
34 lines (+6/-6) 2 files modified
ubuntuone/controlpanel/gui/qt/main/__init__.py (+5/-5) ubuntuone/controlpanel/gui/qt/main/twisted_main.py (+1/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~mikemc/ubuntuone-control-panel/fix-1012887-controlpanel-darwin | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alejandro J. Cura (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- use twisted reactor main loop on darwin as on windows (lp:1012887)
Description of the change
- use twisted reactor main loop on darwin as on windows (lp:1012887)
also renames modules because darwin and windows both use the former 'windows.py'.
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
+1, tests pass on linux