Merge lp://staging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.2 into lp://staging/ubuntuone-control-panel/stable-3-0
Proposed by
Natalia Bidart
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Natalia Bidart | ||||||||
| Approved revision: | 246 | ||||||||
| Merged at revision: | 245 | ||||||||
| Proposed branch: | lp://staging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.2 | ||||||||
| Merge into: | lp://staging/ubuntuone-control-panel/stable-3-0 | ||||||||
| Diff against target: |
376 lines (+288/-4) 8 files modified
ubuntuone/controlpanel/gui/qt/devices.py (+1/-0) ubuntuone/controlpanel/gui/qt/main/__init__.py (+4/-4) ubuntuone/controlpanel/gui/qt/tests/test_devices.py (+22/-0) ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py (+28/-0) ubuntuone/controlpanel/gui/qt/uniqueapp/linux.py (+29/-0) ubuntuone/controlpanel/gui/qt/uniqueapp/tests/__init__.py (+17/-0) ubuntuone/controlpanel/gui/qt/uniqueapp/tests/test_windows.py (+135/-0) ubuntuone/controlpanel/gui/qt/uniqueapp/windows.py (+52/-0) |
||||||||
| To merge this branch: | bzr merge lp://staging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.2 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| dobey (community) | Approve | ||
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| dobey (dobey) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1