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

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @5170   12 years Don-vip cleanup svn:mime-type properties preventing Java sources from being …
(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
(add) @2936   14 years jttt Fixed #4408 confict manager: do not have to solve tag- and …
Note: See TracRevisionLog for help on using the revision log.