Merge lp://qastaging/~mario-kemper/shutter/experimental into lp://qastaging/shutter
Proposed by
Mario Kemper (Romario)
| Status: | Merged |
|---|---|
| Merged at revision: | 851 |
| Proposed branch: | lp://qastaging/~mario-kemper/shutter/experimental |
| Merge into: | lp://qastaging/shutter |
| Diff against target: |
2907 lines (+1892/-255) 17 files modified
bin/shutter (+507/-136) share/icons/hicolor/scalable/apps/shutter-panel.svg (+353/-0) share/icons/ubuntu-mono-dark/scalable/apps/shutter-panel.svg (+346/-0) share/icons/ubuntu-mono-light/scalable/apps/shutter-panel.svg (+346/-0) share/shutter/resources/credits/art (+1/-0) share/shutter/resources/credits/trans (+0/-28) share/shutter/resources/icons/drawing_tool/objects/Tango icon library/Places/folder.icon (+2/-0) share/shutter/resources/icons/drawing_tool/objects/Tango icon library/Status/folder-drag-accept.icon (+2/-0) share/shutter/resources/icons/drawing_tool/objects/Tango icon library/Status/folder-visiting.icon (+2/-0) share/shutter/resources/modules/Shutter/App/Common.pm (+42/-13) share/shutter/resources/modules/Shutter/App/Menu.pm (+12/-0) share/shutter/resources/modules/Shutter/App/ShutterNotification.pm (+36/-35) share/shutter/resources/modules/Shutter/Upload/FTP.pm (+0/-5) share/shutter/resources/modules/Shutter/Upload/ImageBanana.pm (+14/-7) share/shutter/resources/modules/Shutter/Upload/ImageShack.pm (+2/-2) share/shutter/resources/modules/Shutter/Upload/UbuntuOne.pm (+193/-0) share/shutter/resources/modules/Shutter/Upload/UbuntuPics.pm (+34/-29) |
| To merge this branch: | bzr merge lp://qastaging/~mario-kemper/shutter/experimental |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mario Kemper (Romario) | 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
