#
# ChangeLog for trunk/images/dialogs/conflict.png in josm
#
# Generated by Trac 1.6
# 2024-12-12T23:30:02+01:00

Fri, 14 Sep 2007 12:44:28 GMT (none) [321]
	* trunk (added)
	* trunk/.classpath (moved)
	* trunk/.project (moved)
	* trunk/.settings (moved)
	* trunk/CONTRIBUTION (moved)
	* trunk/LICENSE (moved)
	* trunk/README (moved)
	* trunk/build.xml (moved)
	* trunk/data (moved)
	* trunk/images (moved)
	* trunk/josm.reg (moved)
	* trunk/lib (moved)
	* trunk/src (moved)
	* trunk/start.html (moved)
	* trunk/test (moved)

	- restructure of repository to support branches. Do 'svn switch ...


Tue, 03 Jul 2007 20:10:31 GMT imi [270]
	* images/data/key.png (modified)
	* images/dialogs/autoscale/data.png (modified)
	* images/dialogs/autoscale/layer.png (modified)
	* images/dialogs/condiscon.png (modified)
	* images/dialogs/conflict.png (modified)
	* images/dialogs/delete.png (modified)
	* images/dialogs/mergedown.png (modified)
	* images/dialogs/search.png (modified)
	* images/dialogs/showhide.png (modified)
	* images/dialogs/upload.png (modified)
	* images/dialogs/userlist.png (modified)
	* images/mapmode/delete.png (modified)
	* images/mapmode/zoom.png (modified)
	* images/markers/web.png (modified)
	* images/misc/sticky.png (modified)
	* images/overlay/connect.png (modified)
	* images/overlay/disconnect.png (modified)
	* images/preferences/connection.png (modified)
	* images/preferences/display.png (modified)
	* images/preferences/toolbar.png (modified)

	- added new images (thanks Bruce)