source: josm/trunk/src/org/openstreetmap/josm/data/conflict@ 2845

Name Size Rev Age Author Last Change
../
IConflictListener.java 264 bytes 2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
Conflict.java 1.9 KB 2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
ConflictCollection.java 9.2 KB 2845   14 years mjulius fix messages for data
Note: See TracBrowser for help on using the repository browser.