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

Name Size Rev Age Author Last Change
../
package-info.java 196 bytes 11112   9 years Don-vip sonar - squid:S1228 - Packages should have a javadoc file …
PropertiesMergeModel.java 11.7 KB 18489   3 years Don-vip see #22104 - fix deprecation warnings
PropertiesMerger.java 17.7 KB 17340   5 years GerdP fix #19792: Error during conflict resolution after complex import …
Note: See TracBrowser for help on using the repository browser.