Changeset 1676 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java
- Timestamp:
- 2009-06-17T09:02:25+02:00 (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java
r1666 r1676 80 80 gc.gridy = 0; 81 81 lblMergedVersion = new JLabel(tr("Merged version")); 82 lblMergedVersion.setToolTipText(tr("Properties in the merged element. They will replace properties in my elements when merge decisions are applied."));82 lblMergedVersion.setToolTipText(tr("Properties in the merged element. They will replace properties in my elements when merge decisions are applied.")); 83 83 add(lblMergedVersion, gc); 84 84
Note:
See TracChangeset
for help on using the changeset viewer.
