source: josm/images/dialogs/merge.png@ 86

Last change on this file since 86 was 86, checked in by imi, 18 years ago
  • added conflicts and resolve conflict dialog

This is one of those "changed everything" checkpoint.

  • Property svn:mime-type set to application/octet-stream
File size: 652 bytes
images/dialogs/merge.png
Note: See TracBrowser for help on using the repository browser.