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) @2844   15 years mjulius fix messages for commands
(edit) @2512   15 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2301   15 years Gubaer fixed #3765: Unable to resolve conflict Improved warning message for …
(edit) @2070   15 years Gubaer new: rewrite of CombineWay action new: conflict resolution dialog for …
(edit) @2017   15 years Gubaer removed OptionPaneUtil cleanup of deprecated Layer API cleanup of …
(edit) @1989   15 years Gubaer fixed #3281: OsmPrimitiveType fails for fusional and/or agglutinative …
(edit) @1750   16 years Gubaer new: replaced global conflict list by conflict list per layer, similar …
(edit) @1690   16 years Gubaer new: MultiFetchServerObjectReader using APIs Multi Fetch method …
(edit) @1670   16 years Gubaer fixed: bug in OsmApi.getOsmApi() cleanup: exception handling in …
(edit) @1654   16 years Gubaer added merge support for coordinate conflicts added merge support for …
(edit) @1642   16 years Gubaer added row numbers and synchronized scrolling in conflict resolution …
(add) @1622   16 years Gubaer first version of extended conflict resolution dialog.
Note: See TracRevisionLog for help on using the revision log.