source: josm/trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @8855   9 years Don-vip sonar - Unused private method should be removed sonar - Unused …
(edit) @8510   9 years Don-vip checkstyle: enable relevant whitespace checks and fix them
(edit) @8413   9 years Don-vip code style - A close curly brace should be located at the beginning of …
(edit) @7005   10 years Don-vip see #8465 - use diamond operator where applicable
(edit) @6715   10 years Don-vip fix #6633 - Needless 'No conflicts to resolve' dialog
(edit) @6362   11 years Don-vip Checkstyle: - private constructors for util classes - final classes - …
(edit) @6093   11 years akks see #8902 - collection size ==/!= 0 -> isEmpty()/!isEmpty() (patch by …
(edit) @5700   11 years stoecker remove hardcoded created_by
(edit) @3083   14 years bastiK added svn:eol-style=native to source files
(edit) @2512   15 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(add) @2220   15 years Gubaer fixed #3556: False positive conflicts when merging nodes fixed #3460: …
Note: See TracRevisionLog for help on using the revision log.