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

Name Size Rev Age Author Last Change
../
copyaftercurrentleft.png 525 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
copyaftercurrentright.png 625 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
copybeforecurrentleft.png 526 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
copybeforecurrentright.png 626 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
copyendleft.png 606 bytes 4716   13 years simon04 applied lossless compression to all images (pngout)
copyendright.png 597 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
copystartleft.png 634 bytes 4716   13 years simon04 applied lossless compression to all images (pngout)
copystartright.png 589 bytes 4716   13 years simon04 applied lossless compression to all images (pngout)
mergecomplete.png 341 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
mergeincomplete.png 212 bytes 4940   13 years xeen Optimize images. Please report if images changed (esp. if the …
movedown.png 493 bytes 4716   13 years simon04 applied lossless compression to all images (pngout)
moveup.png 455 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
remove.png 510 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
tagconflictresolved 3.0 KB 2008   15 years Gubaer new: tag conflict resolution when pasting tags (only if necessary) …
tagconflictresolved.png 417 bytes 2366   15 years framm pngcrush images
tagconflictunresolved 3.4 KB 2008   15 years Gubaer new: tag conflict resolution when pasting tags (only if necessary) …
tagconflictunresolved.png 477 bytes 2008   15 years Gubaer new: tag conflict resolution when pasting tags (only if necessary) …
tagkeepmine.png 345 bytes 4716   13 years simon04 applied lossless compression to all images (pngout)
tagkeeptheir.png 343 bytes 4716   13 years simon04 applied lossless compression to all images (pngout)
tagundecide.png 563 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
useallleft.png 591 bytes 4940   13 years xeen Optimize images. Please report if images changed (esp. if the …
useallright.png 551 bytes 4716   13 years simon04 applied lossless compression to all images (pngout)
  • Property svn:ignore set to
    Thumbs.db
Note: See TracBrowser for help on using the repository browser.