#
# ChangeLog for images/data/key.png in josm
#
# Generated by Trac 1.6
# 2024-11-01T13:37:55+01:00

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)


Fri, 21 Apr 2006 12:31:51 GMT imi [86]
	* .classpath (modified)
	* .settings/org.eclipse.jdt.core.prefs (modified)
	* .settings/org.eclipse.jdt.ui.prefs (modified)
	* images/data/deleted.png (added)
	* images/data/key.png (added)
	* images/dialogs/merge.png (added)
	* src/org/openstreetmap/josm/Main.java (modified)
	* src/org/openstreetmap/josm/actions/DiskAccessAction.java (modified)
	* src/org/openstreetmap/josm/actions/DownloadAction.java (modified)
	* src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (modified)
	* src/org/openstreetmap/josm/actions/GpxExportAction.java (modified)
	* src/org/openstreetmap/josm/actions/SaveAction.java (modified)
	* src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* src/org/openstreetmap/josm/actions/WmsServerAction.java (modified)
	* src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java (modified)
	* src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java (moved)
	* src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java (modified)
	* src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified)
	* src/org/openstreetmap/josm/actions/mapmode/MapMode.java (modified)
	* src/org/openstreetmap/josm/actions/mapmode/MoveAction.java (modified)
	* src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java (modified)
	* src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java (modified)
	* src/org/openstreetmap/josm/command/AddCommand.java (modified)
	* src/org/openstreetmap/josm/command/ChangePropertyCommand.java (moved)
	* src/org/openstreetmap/josm/command/Command.java (modified)
	* src/org/openstreetmap/josm/command/ConflictResolveCommand.java (added)
	* src/org/openstreetmap/josm/command/DeleteCommand.java (modified)
	* src/org/openstreetmap/josm/command/MoveCommand.java (modified)
	* src/org/openstreetmap/josm/command/SequenceCommand.java (modified)
	* src/org/openstreetmap/josm/data/Bounds.java (modified)
	* src/org/openstreetmap/josm/data/SelectionTracker.java (deleted)
	* src/org/openstreetmap/josm/data/conflict (added)
	* src/org/openstreetmap/josm/data/conflict/ConflictItem.java (added)
	* src/org/openstreetmap/josm/data/conflict/DeleteConflict.java (added)
	* src/org/openstreetmap/josm/data/conflict/FromConflict.java (added)
	* src/org/openstreetmap/josm/data/conflict/PositionConflict.java (added)
	* src/org/openstreetmap/josm/data/conflict/PropertyConflict.java (added)
	* src/org/openstreetmap/josm/data/conflict/SegmentConflict.java (added)
	* src/org/openstreetmap/josm/data/conflict/ToConflict.java (added)
	* src/org/openstreetmap/josm/data/coor/Coordinate.java (modified)
	* src/org/openstreetmap/josm/data/coor/EastNorth.java (modified)
	* src/org/openstreetmap/josm/data/coor/LatLon.java (modified)
	* src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* src/org/openstreetmap/josm/data/osm/Node.java (modified)
	* src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified)
	* src/org/openstreetmap/josm/data/osm/Segment.java (moved)
	* src/org/openstreetmap/josm/data/osm/Way.java (modified)
	* src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java (modified)
	* src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java (modified)
	* src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (modified)
	* src/org/openstreetmap/josm/data/osm/visitor/CloneVisitor.java (added)
	* src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (modified)
	* src/org/openstreetmap/josm/data/osm/visitor/DeleteVisitor.java (modified)
	* src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)
	* src/org/openstreetmap/josm/data/osm/visitor/SelectionComponentVisitor.java (modified)
	* src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified)
	* src/org/openstreetmap/josm/data/osm/visitor/Visitor.java (modified)
	* src/org/openstreetmap/josm/data/projection/Epsg4326.java (modified)
	* src/org/openstreetmap/josm/data/projection/Mercator.java (modified)
	* src/org/openstreetmap/josm/gui/BookmarkList.java (modified)
	* src/org/openstreetmap/josm/gui/ConflictResolver.java (added)
	* src/org/openstreetmap/josm/gui/MapFrame.java (modified)
	* src/org/openstreetmap/josm/gui/MapMover.java (modified)
	* src/org/openstreetmap/josm/gui/MapStatus.java (modified)
	* src/org/openstreetmap/josm/gui/MapView.java (modified)
	* src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified)
	* src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (modified)
	* src/org/openstreetmap/josm/gui/PreferenceDialog.java (modified)
	* src/org/openstreetmap/josm/gui/SelectionManager.java (modified)
	* src/org/openstreetmap/josm/gui/ShowModifiers.java (modified)
	* src/org/openstreetmap/josm/gui/WorldChooser.java (modified)
	* src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (added)
	* src/org/openstreetmap/josm/gui/dialogs/LayerList.java (modified)
	* src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java (modified)
	* src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified)
	* src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified)
	* src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified)
	* src/org/openstreetmap/josm/gui/layer/Layer.java (modified)
	* src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* src/org/openstreetmap/josm/gui/layer/RawGpsDataLayer.java (modified)
	* src/org/openstreetmap/josm/gui/layer/WmsServerLayer.java (modified)
	* src/org/openstreetmap/josm/io/GpxReader.java (modified)
	* src/org/openstreetmap/josm/io/GpxWriter.java (modified)
	* src/org/openstreetmap/josm/io/OsmConnection.java (modified)
	* src/org/openstreetmap/josm/io/OsmReader.java (modified)
	* src/org/openstreetmap/josm/io/OsmReaderOld.java (modified)
	* src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)
	* src/org/openstreetmap/josm/io/OsmWriter.java (modified)
	* src/org/openstreetmap/josm/test (copied)
	* src/org/openstreetmap/josm/test/GpxWriterTest.java (modified)
	* src/org/openstreetmap/josm/test/MergeVisitorTest.java (modified)
	* src/org/openstreetmap/josm/test/OsmWriterTest.java (modified)
	* src/org/openstreetmap/josm/test/framework/DataSetTestCaseHelper.java (modified)
	* src/org/openstreetmap/josm/tools/SearchCompiler.java (modified)
	* test (deleted)

	- added conflicts and resolve conflict dialog
	This is one of those ...