Merge lp://qastaging/~dobey/ubuntu/natty/ubuntuone-control-panel/release-0-9-1 into lp://qastaging/ubuntu/natty/ubuntuone-control-panel
Proposed by
dobey
| Status: | Merged |
|---|---|
| Merged at revision: | 15 |
| Proposed branch: | lp://qastaging/~dobey/ubuntu/natty/ubuntuone-control-panel/release-0-9-1 |
| Merge into: | lp://qastaging/ubuntu/natty/ubuntuone-control-panel |
| Diff against target: |
4681 lines (+2189/-1405) 20 files modified
PKG-INFO (+1/-1) bin/ubuntuone-control-panel-gtk (+4/-2) data/dashboard.ui (+5/-138) data/device.ui (+160/-122) data/management.ui (+214/-101) data/overview.ui (+292/-223) data/services.ui (+309/-14) data/volumes.ui (+20/-20) debian/changelog (+24/-0) debian/control (+4/-4) pylintrc (+1/-1) setup.py (+1/-1) ubuntuone/__init__.py (+0/-1) ubuntuone/controlpanel/backend.py (+5/-1) ubuntuone/controlpanel/gtk/gui.py (+215/-90) ubuntuone/controlpanel/gtk/tests/__init__.py (+92/-7) ubuntuone/controlpanel/gtk/tests/test_gui.py (+235/-670) ubuntuone/controlpanel/gtk/tests/test_gui_basic.py (+595/-0) ubuntuone/controlpanel/tests/__init__.py (+11/-8) ubuntuone/controlpanel/tests/test_backend.py (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~dobey/ubuntu/natty/ubuntuone-control-panel/release-0-9-1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
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
Good work!