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

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @1811   15 years jttt PleaseWait refactoring. Progress is now reported using ProgressMonitor …
(edit) @1790   15 years Gubaer Relation Editor: complete rework Relation Editor: had to temporarily …
(edit) @1692   15 years Gubaer
(edit) @1690   15 years Gubaer new: MultiFetchServerObjectReader using APIs Multi Fetch method …
(edit) @1676   15 years stoecker fix typos
(edit) @1669   15 years stoecker updated i18n
(edit) @1666   15 years Gubaer bug fix: wrong merge state
(edit) @1655   15 years stoecker better i18n of new conflict stuff
(edit) @1654   15 years Gubaer added merge support for coordinate conflicts added merge support for …
(edit) @1653   15 years stoecker add support for compressed OSM files (bzip2, gzip)
(edit) @1650   15 years Gubaer added concept of "merge pairs" (my vs. merged, my vs. their, their vs. …
(edit) @1642   15 years Gubaer added row numbers and synchronized scrolling in conflict resolution …
(edit) @1640   15 years stoecker little bit more refactoring of coordinate access - patch by jttt
(edit) @1631   15 years Gubaer added support for merging member lists of relations in extended …
(edit) @1626   15 years stoecker fixed Java 1.5 problems
(add) @1622   15 years Gubaer first version of extended conflict resolution dialog.
Note: See TracRevisionLog for help on using the revision log.