source: josm/trunk/src/org/openstreetmap/josm/gui/conflict@ 6802

Name Size Rev Age Author Last Change
../
pair 6792   10 years Don-vip Sonar - fix various issues
tags 6802   10 years simon04 fix #9655 - Merge operations loosing tags (regression of r6770) …
ConflictColors.java 3.5 KB 6624   10 years Don-vip fix #9521 - Colors no more displayed in preferences dialog since …
Note: See TracBrowser for help on using the repository browser.