Merge lp://qastaging/~nataliabidart/ubuntu/precise/ubuntuone-control-panel/ubuntuone-control-panel-2.99.1 into lp://qastaging/ubuntu/precise/ubuntuone-control-panel
Proposed by
Natalia Bidart
| Status: | Merged |
|---|---|
| Merged at revision: | 37 |
| Proposed branch: | lp://qastaging/~nataliabidart/ubuntu/precise/ubuntuone-control-panel/ubuntuone-control-panel-2.99.1 |
| Merge into: | lp://qastaging/ubuntu/precise/ubuntuone-control-panel |
| Diff against target: |
387 lines (+161/-116) 9 files modified
PKG-INFO (+1/-1) debian/changelog (+9/-0) debian/control (+6/-6) debian/watch (+1/-1) setup.py (+1/-1) ubuntuone/controlpanel/gui/qt/addfolder.py (+2/-1) ubuntuone/controlpanel/gui/qt/systray.py (+14/-3) ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py (+1/-0) ubuntuone/controlpanel/gui/qt/tests/test_systray.py (+126/-103) |
| To merge this branch: | bzr merge lp://qastaging/~nataliabidart/ubuntu/precise/ubuntuone-control-panel/ubuntuone-control-panel-2.99.1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Sponsors | Pending | ||
|
Review via email:
|
|||
Description of the change
- Updating debian/watch to download from latest milestone.
- New upstream release.
To post a comment you must log in.
Revision history for this message
| Sebastien Bacher (seb128) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thank you for your work!