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

Name Size Rev Age Author Last Change
../
copyaftercurrentleft.png 525 bytes ​ 1974   17 years stoecker optimized PNG images (this time without distorting effects I hope)
copyaftercurrentright.png 625 bytes ​ 1974   17 years stoecker optimized PNG images (this time without distorting effects I hope)
copybeforecurrentleft.png 526 bytes ​ 1974   17 years stoecker optimized PNG images (this time without distorting effects I hope)
copybeforecurrentright.png 626 bytes ​ 1974   17 years stoecker optimized PNG images (this time without distorting effects I hope)
copyendleft.png 616 bytes ​ 1974   17 years stoecker optimized PNG images (this time without distorting effects I hope)
copyendright.png 597 bytes ​ 1974   17 years stoecker optimized PNG images (this time without distorting effects I hope)
copystartleft.png 637 bytes ​ 1974   17 years stoecker optimized PNG images (this time without distorting effects I hope)
copystartright.png 599 bytes ​ 1974   17 years stoecker optimized PNG images (this time without distorting effects I hope)
mergecomplete.png 341 bytes ​ 1974   17 years stoecker optimized PNG images (this time without distorting effects I hope)
mergeincomplete.png 217 bytes ​ 1974   17 years stoecker optimized PNG images (this time without distorting effects I hope)
movedown.png 504 bytes ​ 1974   17 years stoecker optimized PNG images (this time without distorting effects I hope)
moveup.png 455 bytes ​ 1974   17 years stoecker optimized PNG images (this time without distorting effects I hope)
remove.png 510 bytes ​ 1974   17 years stoecker optimized PNG images (this time without distorting effects I hope)
tagconflictresolved 3.0 KB ​ 2008   17 years Gubaer new: tag conflict resolution when pasting tags (only if necessary) …
tagconflictresolved.png 417 bytes ​ 2366   17 years framm pngcrush images
tagconflictunresolved 3.4 KB ​ 2008   17 years Gubaer new: tag conflict resolution when pasting tags (only if necessary) …
tagconflictunresolved.png 477 bytes ​ 2008   17 years Gubaer new: tag conflict resolution when pasting tags (only if necessary) …
tagkeepmine.png 378 bytes ​ 1974   17 years stoecker optimized PNG images (this time without distorting effects I hope)
tagkeeptheir.png 384 bytes ​ 1974   17 years stoecker optimized PNG images (this time without distorting effects I hope)
tagundecide.png 563 bytes ​ 1974   17 years stoecker optimized PNG images (this time without distorting effects I hope)
useallleft.png 701 bytes ​ 2945   17 years jttt Improvements in conflicts gui
useallright.png 666 bytes ​ 2945   17 years jttt Improvements in conflicts gui
Note: See TracBrowser for help on using the repository browser.