#
# ChangeLog for trunk/images_nodist/mergeincomplete.svg in josm
#
# Generated by Trac 1.6
# 2024-10-30T22:37:38+01:00

Tue, 29 Dec 2009 23:25:25 GMT stoecker [2705]
	* trunk/images_nodist/changeset.svg (moved)
	* trunk/images_nodist/changesetdialog.svg (moved)
	* trunk/images_nodist/changesetmanager.svg (moved)
	* trunk/images_nodist/closechangeset.svg (moved)
	* trunk/images_nodist/copyaftercurrentleft.svg (moved)
	* trunk/images_nodist/copyaftercurrentright.svg (moved)
	* trunk/images_nodist/copybeforecurrentleft.svg (moved)
	* trunk/images_nodist/copybeforecurrentright.svg (moved)
	* trunk/images_nodist/copyendleft.svg (moved)
	* trunk/images_nodist/copyendright.svg (moved)
	* trunk/images_nodist/copystartleft.svg (moved)
	* trunk/images_nodist/copystartright.svg (moved)
	* trunk/images_nodist/deletemembers.svg (moved)
	* trunk/images_nodist/downloadchangeset.svg (moved)
	* trunk/images_nodist/downloadchangesetcontent.svg (moved)
	* trunk/images_nodist/downloadincomplete.svg (moved)
	* trunk/images_nodist/downloadincompleteselected.svg (moved)
	* trunk/images_nodist/mergecomplete.svg (moved)
	* trunk/images_nodist/mergeincomplete.svg (moved)
	* trunk/images_nodist/movedown.svg (moved)
	* trunk/images_nodist/moveup.svg (moved)
	* trunk/images_nodist/remove.svg (moved)
	* trunk/images_nodist/reverse.svg (moved)
	* trunk/images_nodist/selectmembers.svg (moved)
	* trunk/images_nodist/selectprimitives.svg (moved)
	* trunk/images_nodist/tagkeepmine.svg (moved)
	* trunk/images_nodist/tagkeeptheir.svg (moved)
	* trunk/images_nodist/tagundecide.svg (moved)
	* trunk/images_nodist/updatechangeset.svg (moved)
	* trunk/images_nodist/updatechangesetcontent.svg (moved)
	* trunk/images_nodist/uploadproperties.svg (moved)

	moved svg's to images_nodist


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