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

Name Size Rev Age Author Last Change
../
copystartleft.svg 4.6 KB 1620   15 years Gubaer icons to be used in the upcoming improved dialog for conflict resolution
copyendleft.svg 4.6 KB 1620   15 years Gubaer icons to be used in the upcoming improved dialog for conflict resolution
copystartright.svg 4.6 KB 1620   15 years Gubaer icons to be used in the upcoming improved dialog for conflict resolution
copyendright.svg 4.6 KB 1620   15 years Gubaer icons to be used in the upcoming improved dialog for conflict resolution
copyaftercurrentleft.svg 4.4 KB 1620   15 years Gubaer icons to be used in the upcoming improved dialog for conflict resolution
copyaftercurrentright.svg 4.4 KB 1620   15 years Gubaer icons to be used in the upcoming improved dialog for conflict resolution
copybeforecurrentleft.svg 4.4 KB 1620   15 years Gubaer icons to be used in the upcoming improved dialog for conflict resolution
copybeforecurrentright.svg 4.4 KB 1620   15 years Gubaer icons to be used in the upcoming improved dialog for conflict resolution
moveup.svg 4.0 KB 1620   15 years Gubaer icons to be used in the upcoming improved dialog for conflict resolution
movedown.svg 4.0 KB 1620   15 years Gubaer icons to be used in the upcoming improved dialog for conflict resolution
remove.svg 3.9 KB 1620   15 years Gubaer icons to be used in the upcoming improved dialog for conflict resolution
tagconflictunresolved 3.4 KB 2008   15 years Gubaer new: tag conflict resolution when pasting tags (only if necessary) …
tagundecide.svg 3.4 KB 1620   15 years Gubaer icons to be used in the upcoming improved dialog for conflict resolution
tagconflictresolved 3.0 KB 2008   15 years Gubaer new: tag conflict resolution when pasting tags (only if necessary) …
tagkeeptheir.svg 2.7 KB 1620   15 years Gubaer icons to be used in the upcoming improved dialog for conflict resolution
tagkeepmine.svg 2.7 KB 1620   15 years Gubaer icons to be used in the upcoming improved dialog for conflict resolution
mergeincomplete.svg 2.3 KB 1620   15 years Gubaer icons to be used in the upcoming improved dialog for conflict resolution
mergecomplete.svg 2.1 KB 1620   15 years Gubaer icons to be used in the upcoming improved dialog for conflict resolution
copystartleft.png 637 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)
copyaftercurrentright.png 625 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
copyendleft.png 616 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
copystartright.png 599 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
copyendright.png 597 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
tagundecide.png 563 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)
copyaftercurrentleft.png 525 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)
movedown.png 504 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
tagconflictunresolved.png 477 bytes 2008   15 years Gubaer new: tag conflict resolution when pasting tags (only if necessary) …
moveup.png 455 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
tagconflictresolved.png 417 bytes 2366   14 years framm pngcrush images
tagkeeptheir.png 384 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
tagkeepmine.png 378 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
mergecomplete.png 341 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
mergeincomplete.png 217 bytes 1974   15 years stoecker optimized PNG images (this time without distorting effects I hope)
Note: See TracBrowser for help on using the repository browser.