Merge lp://staging/~mandel/ubuntuone-windows-installer/add_icon_overlay into lp://staging/ubuntuone-windows-installer/beta
Proposed by
Manuel de la Peña
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 113 | ||||||||
| Proposed branch: | lp://staging/~mandel/ubuntuone-windows-installer/add_icon_overlay | ||||||||
| Merge into: | lp://staging/ubuntuone-windows-installer/beta | ||||||||
| Diff against target: |
636 lines (+242/-84) 11 files modified
install/UbuntuOne7.wxs (+32/-59) install/UbuntuOneXP.wxs (+32/-2) src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml (+1/-1) src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs (+8/-2) src/Canonical.UbuntuOne.Client/Notification/INotificationIconView.cs (+5/-0) src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs (+32/-0) src/Canonical.UbuntuOne.ProcessDispatcher/SyncDaemonService.cs (+1/-1) src/UbuntuOne.sln (+10/-10) src/u1sync/client.py (+0/-1) src/u1sync/icons.py (+121/-0) src/u1sync/main.py (+0/-8) |
||||||||
| To merge this branch: | bzr merge lp://staging/~mandel/ubuntuone-windows-installer/add_icon_overlay | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu One hackers | Pending | ||
|
Review via email:
|
|||
Description of the change
Provide icon overlays.
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
