Shutter

Merge lp://staging/~mario-kemper/shutter/Bug342628 into lp://staging/shutter

  1. Bug342628
  2. Merge into devel
Proposed by Mario Kemper (Romario)
Status: Merged
Merged at revision: 895
Proposed branch: lp://staging/~mario-kemper/shutter/Bug342628
Merge into: lp://staging/shutter
Diff against target: 307 lines (+130/-91)
2 files modified
bin/shutter (+25/-2)
share/shutter/resources/modules/Shutter/Screenshot/SelectorAdvanced.pm (+105/-89)
To merge this branch: bzr merge lp://staging/~mario-kemper/shutter/Bug342628
Reviewer Review Type Date Requested Status
Mario Kemper (Romario) Needs Fixing
Review via email: mp+32311@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Mario Kemper (Romario) (mario-kemper) wrote :

mario@mario:~/shutter/shutter$ bzr merge ../Bug342628
 M bin/shutter
 M share/shutter/resources/modules/Shutter/Screenshot/SelectorAdvanced.pm
Text conflict in share/shutter/resources/modules/Shutter/Screenshot/SelectorAdvanced.pm
1 conflicts encountered.

review: Needs Fixing

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: