source: josm/trunk/images/dialogs/conflict @ 11199

Name Size Rev Age Author Last Change
../
copyaftercurrentleft.svg 4.4 KB 8032   5 years bastiK see #11096 - replace png icons with svg version if available
copyaftercurrentright.svg 4.4 KB 8032   5 years bastiK see #11096 - replace png icons with svg version if available
copybeforecurrentleft.svg 4.4 KB 8032   5 years bastiK see #11096 - replace png icons with svg version if available
copybeforecurrentright.svg 4.4 KB 8032   5 years bastiK see #11096 - replace png icons with svg version if available
copyendleft.svg 4.6 KB 8032   5 years bastiK see #11096 - replace png icons with svg version if available
copyendright.svg 4.6 KB 8032   5 years bastiK see #11096 - replace png icons with svg version if available
copystartleft.svg 4.6 KB 8032   5 years bastiK see #11096 - replace png icons with svg version if available
copystartright.svg 4.6 KB 8032   5 years bastiK see #11096 - replace png icons with svg version if available
mergeincomplete.svg 2.3 KB 8032   5 years bastiK see #11096 - replace png icons with svg version if available
movedown.svg 4.0 KB 8032   5 years bastiK see #11096 - replace png icons with svg version if available
moveup.svg 4.0 KB 8032   5 years bastiK see #11096 - replace png icons with svg version if available
remove.svg 3.9 KB 8032   5 years bastiK see #11096 - replace png icons with svg version if available
tagconflictresolved.svg 3.0 KB 8037   5 years bastiK see #11096 - replace png icons with svg version if available (5)
tagconflictunresolved.svg 3.4 KB 8037   5 years bastiK see #11096 - replace png icons with svg version if available (5)
tagkeepmine.svg 2.7 KB 8032   5 years bastiK see #11096 - replace png icons with svg version if available
tagkeeptheir.svg 2.7 KB 8032   5 years bastiK see #11096 - replace png icons with svg version if available
tagundecide.svg 3.4 KB 8032   5 years bastiK see #11096 - replace png icons with svg version if available
useallleft.png 558 bytes 7668   5 years stoecker cleanup icons, mark undetected icons, set proper mimetype, delete …
useallright.png 512 bytes 7668   5 years stoecker cleanup icons, mark undetected icons, set proper mimetype, delete …
  • Property svn:ignore set to
    Thumbs.db
Note: See TracBrowser for help on using the repository browser.