#
# ChangeLog for trunk/src/org/openstreetmap/josm/command/conflict in josm
#
# Generated by Trac 1.6
# 2024-05-20T11:34:16+02:00

Tue, 15 Apr 2014 22:54:15 GMT Don-vip [6986]
	* trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java (modified)
	* trunk/src/org/openstreetmap/josm/command/conflict/package-info.java (modified)
	* trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified)
	* trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (modified)
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)
	* trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java (modified)
	* trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified)
	* trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapFrameListener.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/Range.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/xml/Prototype.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PrefEntry.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/advanced/package-info.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/audio/package-info.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/display/package-info.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/imagery/package-info.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/map/package-info.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/package-info.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/plugin/package-info.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/projection/package-info.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/package-info.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/package-info.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/package-info.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/validator/package-info.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/widgets/ImageLabel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java (modified)
	* trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/template_engine/StaticText.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateEngineDataProvider.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/template_engine/TemplateEntry.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java (modified)

	sonar - fix various minor issues


Wed, 26 Feb 2014 22:45:59 GMT Don-vip [6887]
	* trunk/src/org/openstreetmap/josm/command/conflict (added)
	* trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java (moved)
	* trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java (moved)
	* trunk/src/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommand.java (moved)
	* trunk/src/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommand.java (moved)
	* trunk/src/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommand.java (moved)
	* trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java (moved)
	* trunk/src/org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java (moved)
	* trunk/src/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommand.java (moved)
	* trunk/src/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommand.java (moved)
	* trunk/src/org/openstreetmap/josm/command/conflict/package-info.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)

	package refactoring of conflict commands => move all of them to new ...