source: josm/trunk/src/org/openstreetmap/josm/data/conflict

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @7509   5 years stoecker remove tabs
(edit) @7005   5 years Don-vip see #8465 - use diamond operator where applicable
(edit) @6555   6 years Don-vip fix #4183 - split number of conflicts in conflict-list header …
(edit) @6313   6 years Don-vip cosmetics in error reporting
(edit) @6175   6 years Don-vip see #8902 - Small performance enhancements / coding style (patches by …
(edit) @6104   6 years Don-vip see #8902 - Small performance enhancements / coding style (patch by …
(edit) @6084   6 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
(edit) @6069   6 years stoecker see #8853 remove tabs, trailing spaces, windows line ends, strange …
(edit) @5909   6 years stoecker fix all remaining javadoc warnings
(edit) @5298   7 years Don-vip see #4899, see #7266, see #7333: Resolved NPE in conflict manager when …
(edit) @5266   7 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
(edit) @3530   9 years stoecker fix array preferences
(edit) @3083   9 years bastiK added svn:eol-style=native to source files
(edit) @3034   10 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
(edit) @2979   10 years Gubaer fixed #4386: "There are unsolved conflicts in layer X" holds up any …
(edit) @2949   10 years jttt Show only one message box in conflicts dialog when multiple members …
(edit) @2915   10 years stoecker close #4458 - text fixes - patch by Andre
(edit) @2881   10 years jttt Fixed #4412 after confict management: selecting a relation does not …
(edit) @2845   10 years mjulius fix messages for data
(edit) @2655   10 years jttt Fixed #4161 Major slowdown in recent versions, used correct pattern …
(edit) @2512   10 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2381   10 years jttt Change most occurrences of Dataset.nodes/ways/relations with …
(edit) @2198   10 years Gubaer fixed #3249: Resolve conflicts between invisible and deleted …
(edit) @2181   10 years stoecker lots of i18n fixes
(edit) @2017   10 years Gubaer removed OptionPaneUtil cleanup of deprecated Layer API cleanup of …
(edit) @1911   10 years Gubaer fixed #3193: No layer is left highlighted when the bottom most one is …
(edit) @1857   10 years Gubaer replaced JOptionDialog.show... by OptionPaneUtil.show.... improved …
(add) @1750   10 years Gubaer new: replaced global conflict list by conflict list per layer, similar …
Note: See TracRevisionLog for help on using the revision log.