source: josm/trunk/resources/images/dialogs/conflict@ 19446

Name Size Rev Age Author Last Change
../
copyaftercurrentleft.svg 4.3 KB ​ 18329   4 years stoecker remove private path information form SVG files
copyaftercurrentright.svg 4.3 KB ​ 18329   4 years stoecker remove private path information form SVG files
copybeforecurrentleft.svg 4.3 KB ​ 18329   4 years stoecker remove private path information form SVG files
copybeforecurrentright.svg 4.3 KB ​ 18329   4 years stoecker remove private path information form SVG files
copyendleft.svg 4.6 KB ​ 18329   4 years stoecker remove private path information form SVG files
copyendright.svg 4.6 KB ​ 18329   4 years stoecker remove private path information form SVG files
copystartleft.svg 4.6 KB ​ 18329   4 years stoecker remove private path information form SVG files
copystartright.svg 4.6 KB ​ 18329   4 years stoecker remove private path information form SVG files
mergeincomplete.svg 2.3 KB ​ 18329   4 years stoecker remove private path information form SVG files
movedown.svg 4.0 KB ​ 18329   4 years stoecker remove private path information form SVG files
moveup.svg 4.0 KB ​ 18329   4 years stoecker remove private path information form SVG files
remove.svg 3.8 KB ​ 18329   4 years stoecker remove private path information form SVG files
tagconflictresolved.svg 3.0 KB ​ 13363   8 years stoecker see #15240 replace statusline png icons with svg variants by floscher, …
tagconflictunresolved.svg 3.4 KB ​ 18329   4 years stoecker remove private path information form SVG files
tagkeepmine.svg 2.6 KB ​ 18329   4 years stoecker remove private path information form SVG files
tagkeeptheir.svg 2.6 KB ​ 18329   4 years stoecker remove private path information form SVG files
tagundecide.svg 3.3 KB ​ 18329   4 years stoecker remove private path information form SVG files
useallleft.svg 4.3 KB ​ 18329   4 years stoecker remove private path information form SVG files
useallright.svg 4.3 KB ​ 18329   4 years stoecker remove private path information form SVG files
  • Property svn:ignore set to
    Thumbs.db
Note: See TracBrowser for help on using the repository browser.