Merge lp://qastaging/~ubuntuone-control-tower/ubuntu/lucid/ubuntuone-client/trunk into lp://qastaging/ubuntu/lucid/ubuntuone-client
Proposed by
dobey
| Status: | Merged |
|---|---|
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~ubuntuone-control-tower/ubuntu/lucid/ubuntuone-client/trunk |
| Merge into: | lp://qastaging/ubuntu/lucid/ubuntuone-client |
| Diff against target: |
486 lines (+151/-63) 12 files modified
bin/ubuntuone-preferences (+4/-3) configure (+10/-10) configure.ac (+1/-1) debian/changelog (+11/-0) debian/patches/revert_string_change.patch (+0/-25) debian/rules (+0/-1) nautilus/contacts-view.c (+30/-8) nautilus/contacts-view.h (+3/-0) nautilus/u1-contacts-picker.c (+1/-1) nautilus/ubuntuone-nautilus.c (+52/-8) tests/syncdaemon/test_localrescan.py (+25/-0) ubuntuone/syncdaemon/local_rescan.py (+14/-6) |
| To merge this branch: | bzr merge lp://qastaging/~ubuntuone-control-tower/ubuntu/lucid/ubuntuone-client/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
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
