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

Name Size Rev Age Author Last Change
../
PropertiesMergeModel.java 11.7 KB 9243   10 years Don-vip javadoc update
PropertiesMerger.java 19.2 KB 9440   10 years simon04 see #12338 - Conflict resolution: add expert actions "Resolve to …
Note: See TracBrowser for help on using the repository browser.