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

Name Size Rev Age Author Last Change
../
nodes 2990   14 years jttt Fix some eclipse warnings
properties 2945   14 years jttt Improvements in conflicts gui
relation 2990   14 years jttt Fix some eclipse warnings
tags 2990   14 years jttt Fix some eclipse warnings
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.4 KB 2945   14 years jttt Improvements in conflicts gui
IConflictResolver.java 293 bytes 2945   14 years jttt Improvements in conflicts gui
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.