Changeset 7668 in josm for trunk/images/dialogs/conflict

Timestamp:

2014-10-29T15:24:07+01:00 (11 years ago)

Author:

stoecker

Message:

cleanup icons, mark undetected icons, set proper mimetype, delete unused icons, update geticons script

Location:

trunk/images/dialogs/conflict

Files:

• copyaftercurrentleft.png (modified) (1 prop) ( previous)
• copyaftercurrentright.png (modified) (1 prop) ( previous)
• copybeforecurrentleft.png (modified) (1 prop) ( previous)
• copybeforecurrentright.png (modified) (1 prop) ( previous)
• copyendleft.png (modified) (1 prop) ( previous)
• copyendright.png (modified) (1 prop) ( previous)
• copystartleft.png (modified) (1 prop) ( previous)
• copystartright.png (modified) (1 prop) ( previous)
• mergeincomplete.png (modified) (1 prop) ( previous)
• movedown.png (modified) (1 prop) ( previous)
• moveup.png (modified) (1 prop) ( previous)
• remove.png (modified) (1 prop) ( previous)
• tagconflictresolved.png (modified) (1 prop) ( previous)
• tagconflictunresolved.png (modified) (1 prop) ( previous)
• tagkeepmine.png (modified) (1 prop) ( previous)
• tagkeeptheir.png (modified) (1 prop) ( previous)
• tagundecide.png (modified) (1 prop) ( previous)
• useallleft.png (modified) (1 prop) ( previous)
• useallright.png (modified) (1 prop) ( previous)