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

Name Size Rev Age Author Last Change
../
ConflictCollection.java 9.7 KB 2181   16 years stoecker lots of i18n fixes
IConflictListener.java 271 bytes 1750   16 years Gubaer new: replaced global conflict list by conflict list per layer, similar …
Conflict.java 2.0 KB 2198   16 years Gubaer fixed #3249: Resolve conflicts between invisible and deleted …
Note: See TracBrowser for help on using the repository browser.