#
# ChangeLog for trunk/images/dialogs/conflict in josm
#
# Generated by Trac 1.6
# 2024-04-26T21:46:52+02:00

Sun, 24 May 2009 21:19:53 GMT Gubaer [1620]
	* trunk/images/dialogs/conflict (added)
	* trunk/images/dialogs/conflict/copyaftercurrentleft.png (added)
	* trunk/images/dialogs/conflict/copyaftercurrentleft.svg (added)
	* trunk/images/dialogs/conflict/copyaftercurrentright.png (added)
	* trunk/images/dialogs/conflict/copyaftercurrentright.svg (added)
	* trunk/images/dialogs/conflict/copybeforecurrentleft.png (added)
	* trunk/images/dialogs/conflict/copybeforecurrentleft.svg (added)
	* trunk/images/dialogs/conflict/copybeforecurrentright.png (added)
	* trunk/images/dialogs/conflict/copybeforecurrentright.svg (added)
	* trunk/images/dialogs/conflict/copyendleft.png (added)
	* trunk/images/dialogs/conflict/copyendleft.svg (added)
	* trunk/images/dialogs/conflict/copyendright.png (added)
	* trunk/images/dialogs/conflict/copyendright.svg (added)
	* trunk/images/dialogs/conflict/copystartleft.png (added)
	* trunk/images/dialogs/conflict/copystartleft.svg (added)
	* trunk/images/dialogs/conflict/copystartright.png (added)
	* trunk/images/dialogs/conflict/copystartright.svg (added)
	* trunk/images/dialogs/conflict/mergecomplete.png (added)
	* trunk/images/dialogs/conflict/mergecomplete.svg (added)
	* trunk/images/dialogs/conflict/mergeincomplete.png (added)
	* trunk/images/dialogs/conflict/mergeincomplete.svg (added)
	* trunk/images/dialogs/conflict/movedown.png (added)
	* trunk/images/dialogs/conflict/movedown.svg (added)
	* trunk/images/dialogs/conflict/moveup.png (added)
	* trunk/images/dialogs/conflict/moveup.svg (added)
	* trunk/images/dialogs/conflict/remove.png (added)
	* trunk/images/dialogs/conflict/remove.svg (added)
	* trunk/images/dialogs/conflict/tagkeepmine.png (added)
	* trunk/images/dialogs/conflict/tagkeepmine.svg (added)
	* trunk/images/dialogs/conflict/tagkeeptheir.png (added)
	* trunk/images/dialogs/conflict/tagkeeptheir.svg (added)
	* trunk/images/dialogs/conflict/tagundecide.png (added)
	* trunk/images/dialogs/conflict/tagundecide.svg (added)

	icons to be used in the upcoming improved dialog for conflict
	resolution