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

Name Size Rev Age Author Last Change
../
Conflict.java 1.9 KB 2512   10 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
IConflictListener.java 264 bytes 2512   10 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
ConflictCollection.java 9.2 KB 2655   10 years jttt Fixed #4161 Major slowdown in recent versions, used correct pattern …
Note: See TracBrowser for help on using the repository browser.