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

Name Size Rev Age Author Last Change
../
OperationCancelledException.java 720 bytes 3083   14 years bastiK added svn:eol-style=native to source files
PropertiesMergeModel.java 11.1 KB 3362   14 years stoecker fix #5182 - Conflict system simplification - patch by Upliner
PropertiesMerger.java 18.3 KB 3362   14 years stoecker fix #5182 - Conflict system simplification - patch by Upliner
Note: See TracBrowser for help on using the repository browser.