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) @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) @2949   14 years jttt Show only one message box in conflicts dialog when multiple members …
(edit) @2915   14 years stoecker close #4458 - text fixes - patch by Andre
(edit) @2881   14 years jttt Fixed #4412 after confict management: selecting a relation does not …
(edit) @2845   14 years mjulius fix messages for data
(edit) @2655   14 years jttt Fixed #4161 Major slowdown in recent versions, used correct pattern …
(edit) @2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2381   14 years jttt Change most occurrences of Dataset.nodes/ways/relations with …
(edit) @2198   15 years Gubaer fixed #3249: Resolve conflicts between invisible and deleted …
(edit) @2181   15 years stoecker lots of i18n fixes
(edit) @2017   15 years Gubaer removed OptionPaneUtil cleanup of deprecated Layer API cleanup of …
(edit) @1911   15 years Gubaer fixed #3193: No layer is left highlighted when the bottom most one is …
(edit) @1857   15 years Gubaer replaced JOptionDialog.show... by OptionPaneUtil.show.... improved …
(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.