Changeset 1954 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
- Timestamp:
- 2009-08-11T13:23:06+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
r1904 r1954 27 27 import org.openstreetmap.josm.gui.OptionPaneUtil; 28 28 import org.openstreetmap.josm.gui.PrimitiveNameFormatter; 29 import org.openstreetmap.josm.gui.conflict. ConflictResolver;30 import org.openstreetmap.josm.gui.conflict.p roperties.OperationCancelledException;29 import org.openstreetmap.josm.gui.conflict.pair.ConflictResolver; 30 import org.openstreetmap.josm.gui.conflict.pair.properties.OperationCancelledException; 31 31 import org.openstreetmap.josm.tools.ImageProvider; 32 32
Note:
See TracChangeset
for help on using the changeset viewer.