source: josm/trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @1750   15 years Gubaer new: replaced global conflict list by conflict list per layer, similar …
(edit) @1690   15 years Gubaer new: MultiFetchServerObjectReader using APIs Multi Fetch method …
(edit) @1670   15 years Gubaer fixed: bug in OsmApi.getOsmApi() cleanup: exception handling in …
(edit) @1654   15 years Gubaer added merge support for coordinate conflicts added merge support for …
(edit) @1642   15 years Gubaer added row numbers and synchronized scrolling in conflict resolution …
(add) @1622   15 years Gubaer first version of extended conflict resolution dialog.
Note: See TracRevisionLog for help on using the revision log.