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

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @8880   6 years Don-vip checkstyle + remove call to org.hamcrest.CoreMatchers.is (generating …
(edit) @8871   6 years simon04 fix #10018 fix #11945 - Improve relation member conflict resolution …
(edit) @8857   6 years Don-vip improve/cleanup unit tests
(edit) @8513   6 years Don-vip checkstyle: blocks
(edit) @8510   6 years Don-vip checkstyle: enable relevant whitespace checks and fix them
(edit) @8509   6 years Don-vip fix many checkstyle violations
(edit) @8391   6 years Don-vip fix unit tests
(edit) @7937   7 years bastiK add subversion property svn:eol=native
(edit) @7081   7 years Don-vip fixes for unit tests
(edit) @7005   7 years Don-vip see #8465 - use diamond operator where applicable
(edit) @6471   8 years Don-vip Sonar - remove warnings related to the static preferences …
(edit) @3577   11 years jttt Fix tests
(edit) @3095   12 years jttt Changes in multipolygon handling (see #4661), cosmetics
(edit) @3025   12 years jttt Fix tests
(edit) @2990   12 years jttt Fix some eclipse warnings
(edit) @2676   12 years jttt Fix some of the warnings found by FindBugs
(edit) @1954   12 years Gubaer Moved package org.openstreetmap.josm.gui.conflict to …
(edit) @1654   12 years Gubaer added merge support for coordinate conflicts added merge support for …
(edit) @1631   12 years Gubaer added support for merging member lists of relations in extended …
(add) @1622   12 years Gubaer first version of extended conflict resolution dialog.
Note: See TracRevisionLog for help on using the revision log.