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