#
# ChangeLog for trunk/test/config/unit-josm.home in josm
#
# Generated by Trac 1.6
# 2024-11-29T07:53:15+01:00

Wed, 08 Jul 2009 19:50:32 GMT Gubaer [1750]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DeleteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MoveAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified)
	* trunk/src/org/openstreetmap/josm/command/AddCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangeCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/Command.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (added)
	* trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RotateCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/SequenceCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/conflict (added)
	* trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (added)
	* trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (added)
	* trunk/src/org/openstreetmap/josm/data/conflict/IConflictListener.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapView.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/PointInTimeType.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)
	* trunk/test/config (added)
	* trunk/test/config/unit-josm.home (added)
	* trunk/test/config/unit-josm.home/preferences (added)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)

	new: replaced global conflict list by conflict list per layer, ...