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

Name Size Rev Age Author Last Change
../
OperationCancelledException.java 720 bytes 2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
PropertiesMergeModel.java 22.3 KB 2936   14 years jttt Fixed #4408 confict manager: do not have to solve tag- and …
PropertiesMerger.java 24.9 KB 2938   14 years jttt Addition to #4408 (don't require to merge coordinates after primitive …
Note: See TracBrowser for help on using the repository browser.