source: josm/trunk/src/org/openstreetmap/josm/gui/conflict/pair/MergeDecisionType.java

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @3083   14 years bastiK added svn:eol-style=native to source files
(edit) @2512   15 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(copy) @1954   15 years Gubaer Moved package org.openstreetmap.josm.gui.conflict to …
copied from trunk/src/org/openstreetmap/josm/gui/conflict/MergeDecisionType.java
(copy) @1654   15 years Gubaer added merge support for coordinate conflicts added merge support for …
Note: See TracRevisionLog for help on using the revision log.