Changeset 5903 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java
- Timestamp:
- 2013-04-25T17:57:04+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java
r5266 r5903 13 13 14 14 /** 15 * compare my version of an {@link OsmPrimitive} with their version15 * compare my version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with their version 16 16 */ 17 17 MY_WITH_THEIR (tr("My with Their"), new ListRole[] {MY_ENTRIES, THEIR_ENTRIES}), 18 18 19 19 /** 20 * compare my version of an {@link OsmPrimitive} with the merged version20 * compare my version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with the merged version 21 21 */ 22 22 MY_WITH_MERGED (tr("My with Merged"), new ListRole[] {MY_ENTRIES, MERGED_ENTRIES}), 23 23 24 24 /** 25 * compare their version of an {@link OsmPrimitive} with the merged veresion25 * compare their version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with the merged veresion 26 26 */ 27 27 THEIR_WITH_MERGED(tr("Their with Merged"), new ListRole[] {THEIR_ENTRIES, MERGED_ENTRIES});
Note:
See TracChangeset
for help on using the changeset viewer.