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

Name Size Rev Age Author Last Change
../
PropertiesMergeModel.java 11.5 KB 5481   13 years stoecker some cleanup, mainly javadoc
PropertiesMerger.java 18.8 KB 6084   12 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
Note: See TracBrowser for help on using the repository browser.