#
# ChangeLog for trunk/images/dialogs/conflict/tagconflictresolved in josm
#
# Generated by Trac 1.6
# 2024-04-19T23:11:25+02:00

Sun, 30 Aug 2009 13:41:28 GMT Gubaer [2008]
	* trunk/images/dialogs/conflict/tagconflictresolved (added)
	* trunk/images/dialogs/conflict/tagconflictresolved.png (added)
	* trunk/images/dialogs/conflict/tagconflictunresolved (added)
	* trunk/images/dialogs/conflict/tagconflictunresolved.png (added)
	* trunk/src/org/openstreetmap/josm/actions/AboutAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Tag.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueDecisionType.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java (added)
	* trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (added)

	new: tag conflict resolution when pasting tags (only if necessary) ...