source: josm/trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.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) @3034   14 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
(edit) @2945   14 years jttt Improvements in conflicts gui
(edit) @2936   14 years jttt Fixed #4408 confict manager: do not have to solve tag- and …
(edit) @2512   14 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/tags/TagMergeModel.java
(edit) @1654   15 years Gubaer added merge support for coordinate conflicts added merge support for …
Note: See TracRevisionLog for help on using the revision log.