Changeset 8509 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
- Timestamp:
- 2015-06-20T14:36:00+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
r8470 r8509 276 276 gc.gridy = 0; 277 277 lblMergedVersion = new JLabel(tr("Merged version")); 278 lblMergedVersion.setToolTipText(tr("List of merged elements. They will replace the list of my elements when the merge decisions are applied.")); 278 lblMergedVersion.setToolTipText( 279 tr("List of merged elements. They will replace the list of my elements when the merge decisions are applied.")); 279 280 add(lblMergedVersion, gc); 280 281
Note:
See TracChangeset
for help on using the changeset viewer.