Changeset 4310 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
- Timestamp:
- 2011-08-11T00:26:21+02:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
r4116 r4310 23 23 /** 24 24 * This is the model for resolving conflicts in the properties of the 25 * {@see OsmPrimitive}s. In particular, it represents conflicts in the coordi ates of {@see Node}s and25 * {@see OsmPrimitive}s. In particular, it represents conflicts in the coordinates of {@see Node}s and 26 26 * the deleted or visible state of {@see OsmPrimitive}s. 27 27 *
Note:
See TracChangeset
for help on using the changeset viewer.