source: josm/trunk/src/org/openstreetmap/josm/gui/conflict/pair@ 3034

Name Size Rev Age Author Last Change
../
nodes 3034   14 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
properties 3034   14 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
relation 3034   14 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
tags 3034   14 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
ComparePairListCellRenderer.java 899 bytes 2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
ComparePairType.java 2.8 KB 2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
ConflictResolver.java 14.6 KB 3034   14 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
IConflictResolver.java 353 bytes 3034   14 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
ListMergeModel.java 28.7 KB 3025   14 years jttt Fix tests
ListMerger.java 37.7 KB 2991   14 years Gubaer Updated two tooltip texts
ListRole.java 252 bytes 2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
MergeDecisionType.java 179 bytes 2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
Note: See TracBrowser for help on using the repository browser.