~jeremywootten/screenshot-tool/fix-1438250-include-child-windows

Viewing all changes in revision 318.

  • Committer: Jeremy Wootten
  • Date: 2017-04-06 17:39:50 UTC
  • mfrom: (314.1.4 screenshot-tool)
  • Revision ID: jeremy@elementaryos.org-20170406173950-wwdmlk6b5lqi6jr1
Merge trunk to r318 and resolve conflict

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: