source: josm/trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @6881   10 years Don-vip javadoc/code style/minor refactorization
(edit) @6248   11 years Don-vip Rework console output: - new log level "error" - Replace nearly all …
(edit) @5816   11 years stoecker javadoc fixes
(edit) @5266   12 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
(edit) @4191   13 years stoecker remove old debug stuff
(edit) @3083   14 years bastiK added svn:eol-style=native to source files
(edit) @2844   14 years mjulius fix messages for commands
(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) @2163   15 years stoecker fixed typos
(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.