source: josm/trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @10662   8 years Don-vip see #12472, fix #13230, fix #13225, fix #13228 - disable …
(edit) @10659   8 years Don-vip see #12472 - fix more warnings, increase maximum number of reported …
(edit) @9371   8 years simon04 Java 7: use Objects.equals and Objects.hash
(edit) @9239   8 years Don-vip javadoc update
(edit) @9230   8 years Don-vip fix javadoc errors/warnings
(edit) @8846   9 years Don-vip sonar - fb-contrib - minor performance improvements: * Method passes …
(edit) @8510   9 years Don-vip checkstyle: enable relevant whitespace checks and fix them
(edit) @6313   11 years Don-vip cosmetics in error reporting
(edit) @6069   11 years stoecker see #8853 remove tabs, trailing spaces, windows line ends, strange …
(edit) @5298   12 years Don-vip see #4899, see #7266, see #7333: Resolved NPE in conflict manager when …
(edit) @5266   12 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
(edit) @3530   14 years stoecker fix array preferences
(edit) @3083   14 years bastiK added svn:eol-style=native to source files
(edit) @3034   14 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
(edit) @2979   14 years Gubaer fixed #4386: "There are unsolved conflicts in layer X" holds up any …
(edit) @2881   14 years jttt Fixed #4412 after confict management: selecting a relation does not …
(edit) @2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2198   15 years Gubaer fixed #3249: Resolve conflicts between invisible and deleted …
(edit) @1911   15 years Gubaer fixed #3193: No layer is left highlighted when the bottom most one is …
(add) @1750   15 years Gubaer new: replaced global conflict list by conflict list per layer, similar …
Note: See TracRevisionLog for help on using the revision log.