source: josm/trunk/src/org/openstreetmap/josm/gui/conflict/tags

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) @2996   14 years jttt Fix #4406 tags disapear: merging node with ID:0 and tag to existing …
(edit) @2990   14 years jttt Fix some eclipse warnings
(edit) @2846   14 years mjulius fix messages for gui/conflict
(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) @2726   14 years framm fix message text
(edit) @2712   14 years mjulius fixes #4252 - Handling relations of way combining unintuitive For both …
(edit) @2655   14 years jttt Fixed #4161 Major slowdown in recent versions, used correct pattern …
(edit) @2626   14 years jttt Fixed some of the warnings found by FindBugs
(edit) @2565   15 years Gubaer Removed BackReferenceDataSet and CollectBackReferenceVisitor because …
(edit) @2512   15 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2326   15 years Gubaer Slightly improved dialogs for way combining and node merging. Added …
(edit) @2237   15 years stoecker removed translation conflict (now also compiles)
(edit) @2236   15 years stoecker removed translation conflict
(edit) @2220   15 years Gubaer fixed #3556: False positive conflicts when merging nodes fixed #3460: …
(edit) @2181   15 years stoecker lots of i18n fixes
(edit) @2164   15 years stoecker fixed typo
(edit) @2157   15 years Gubaer fixed #3534: Merge dialog "remembers" old relations
(edit) @2141   15 years Gubaer applied #3513: patch by Claudius Henrichs : Typos and unifying …
(edit) @2115   15 years Gubaer new: reading open changesets from the server new: reading user info …
(edit) @2104   15 years Gubaer fixed #3402: Conflict in created_by when merging nodes or ways …
(edit) @2103   15 years Gubaer fixing bug member conflict handling
(edit) @2099   15 years Gubaer added auto completion to combine way dialog fixed #3461: Value …
(edit) @2095   15 years Gubaer rewrite of MergeNodesAction new: new conflict resolution dialog for …
(edit) @2070   15 years Gubaer new: rewrite of CombineWay action new: conflict resolution dialog for …
(edit) @2017   15 years Gubaer removed OptionPaneUtil cleanup of deprecated Layer API cleanup of …
(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.