source: josm/trunk/test/unit/org/openstreetmap/josm/gui/conflict

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @2676   13 years jttt Fix some of the warnings found by FindBugs
(edit) @2626   13 years jttt Fixed some of the warnings found by FindBugs
(edit) @2620   13 years jttt Remove OsmPrimitive.setIncomplete()
(edit) @2578   13 years jttt Encalupse OsmPrimitive.incomplete
(edit) @2077   13 years Gubaer Had to replace DataSet:getPrimitiveById(id) with …
(edit) @1954   13 years Gubaer Moved package org.openstreetmap.josm.gui.conflict to …
(edit) @1910   13 years jttt Way refactoring - finish replacing Way.nodes with the new api
(edit) @1703   13 years Gubaer added test cases
(edit) @1654   13 years Gubaer added merge support for coordinate conflicts added merge support for …
(edit) @1650   13 years Gubaer added concept of "merge pairs" (my vs. merged, my vs. their, their vs. …
(edit) @1631   13 years Gubaer added support for merging member lists of relations in extended …
(add) @1622   13 years Gubaer first version of extended conflict resolution dialog.
Note: See TracRevisionLog for help on using the revision log.