source: josm/trunk/src/org/openstreetmap/josm/gui/conflict/properties

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @1811   16 years jttt PleaseWait refactoring. Progress is now reported using ProgressMonitor …
(edit) @1692   16 years Gubaer
(edit) @1690   16 years Gubaer new: MultiFetchServerObjectReader using APIs Multi Fetch method …
(edit) @1676   16 years stoecker fix typos
(edit) @1669   16 years stoecker updated i18n
(edit) @1666   16 years Gubaer bug fix: wrong merge state
(add) @1654   16 years Gubaer added merge support for coordinate conflicts added merge support for …
Note: See TracRevisionLog for help on using the revision log.