Merge lp://qastaging/~mario-kemper/shutter/dont_save into lp://qastaging/shutter

Proposed by Mario Kemper (Romario)
Status: Merged
Merged at revision: 949
Proposed branch: lp://qastaging/~mario-kemper/shutter/dont_save
Merge into: lp://qastaging/shutter
Diff against target: 1283 lines (+180/-854) (has conflicts)
7 files modified
bin/shutter (+86/-45)
share/shutter/resources/modules/File/HomeDir.pm (+0/-618)
share/shutter/resources/modules/File/HomeDir/Driver.pm (+0/-19)
share/shutter/resources/modules/File/HomeDir/Unix.pm (+0/-167)
share/shutter/resources/modules/Shutter/App/Directories.pm (+72/-0)
share/shutter/resources/modules/Shutter/App/Menu.pm (+6/-0)
share/shutter/resources/modules/Shutter/Draw/DrawingTool.pm (+16/-5)
Text conflict in bin/shutter
To merge this branch: bzr merge lp://qastaging/~mario-kemper/shutter/dont_save
Reviewer Review Type Date Requested Status
Mario Kemper (Romario) Pending
Review via email: mp+38885@code.qastaging.launchpad.net
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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: