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

Name Size Rev Age Author Last Change
../
ConflictItem.java 1.3 KB 1169   17 years stoecker removed usage of tab stops
DeleteConflict.java 942 bytes 1567   16 years framm * fixed some more conflict resolution bugs, especially relating to …
PositionConflict.java 1.1 KB 1636   16 years stoecker fix #2302 - patch by jttt - some code cleanup for better encapsulation
PropertyConflict.java 1.0 KB 1567   16 years framm * fixed some more conflict resolution bugs, especially relating to …
Note: See TracBrowser for help on using the repository browser.