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

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @3766   13 years stoecker fix help
(edit) @3530   14 years stoecker fix array preferences
(edit) @3083   14 years bastiK added svn:eol-style=native to source files
(edit) @3025   14 years jttt Fix tests
(edit) @2983   14 years Gubaer see #4054: Improving user feedback when trying to merge a deleted …
(edit) @2949   14 years jttt Show only one message box in conflicts dialog when multiple members …
(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) @2881   14 years jttt Fixed #4412 after confict management: selecting a relation does not …
(edit) @2846   14 years mjulius fix messages for gui/conflict
(edit) @2569   14 years Gubaer fixed #3684: Add "chunked" upload mode Removed support for API "0.5" …
(edit) @2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2181   15 years stoecker lots of i18n fixes
(edit) @2039   15 years Gubaer applied #3377: patch by xeen: Less warnings for JOSM
(copy) @1954   15 years Gubaer Moved package org.openstreetmap.josm.gui.conflict to …
copied from trunk/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java
(edit) @1650   15 years Gubaer added concept of "merge pairs" (my vs. merged, my vs. their, their vs. …
Note: See TracRevisionLog for help on using the revision log.