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

Name Size Rev Age Author Last Change
../
Conflict.java 3.7 KB 5298   7 years Don-vip see #4899, see #7266, see #7333: Resolved NPE in conflict manager when …
ConflictCollection.java 9.4 KB 5266   7 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
IConflictListener.java 264 bytes 3083   9 years bastiK added svn:eol-style=native to source files
Note: See TracBrowser for help on using the repository browser.