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

Name Size Rev Age Author Last Change
../
pair 7668   9 years stoecker cleanup icons, mark undetected icons, set proper mimetype, delete …
tags 7674   9 years Don-vip code refactoring to avoid hacks in merge-overlap plugin
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.