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

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @12841   7 years bastiK see #15229 - fix deprecations caused by [12840]
(edit) @11772   7 years Don-vip fix #14475 - Deadlock while starting unit tests: remove the need to …
(edit) @10611   8 years Don-vip see #11390 - sonar - squid:S1604 - Java 8: Anonymous inner classes …
(edit) @10179   8 years Don-vip sonar - squid:AssignmentInSubExpressionCheck - Assignments should not …
(edit) @9543   8 years Don-vip refactoring - global simplification of use of setLayout method - …
(edit) @9078   8 years Don-vip sonar - Immutable Field
(edit) @8510   9 years Don-vip checkstyle: enable relevant whitespace checks and fix them
(edit) @6890   10 years Don-vip fix some Sonar issues (Constructor Calls Overridable Method)
(edit) @6616   10 years Don-vip fix #4073 - colour coding of conflicting tags/memberships in way …
(edit) @6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
(edit) @5832   11 years stoecker i18n update and javadoc fixes
(edit) @5266   12 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
(edit) @5132   12 years simon04 fix #7513 - Warn non-experts when combining ways with conflicting tags …
(edit) @3083   14 years bastiK added svn:eol-style=native to source files
(edit) @2814   14 years mjulius fixes #4347 - merging 2 nodes produces ERROR
(edit) @2779   14 years mjulius fixes #4253 - Combine way conflict dialog - check box for "Show tags …
(edit) @2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2220   15 years Gubaer fixed #3556: False positive conflicts when merging nodes fixed #3460: …
(add) @2008   15 years Gubaer new: tag conflict resolution when pasting tags (only if necessary) …
Note: See TracRevisionLog for help on using the revision log.