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

Name Size Rev Age Author Last Change
../
PropertiesMergeModel.java 11.4 KB 4115   14 years stoecker fix #4564 - conflict manager: highlight conflict on properties
PropertiesMerger.java 18.3 KB 3362   15 years stoecker fix #5182 - Conflict system simplification - patch by Upliner
Note: See TracBrowser for help on using the repository browser.