source: josm/src/org/openstreetmap/josm/gui/ConflictResolver.java

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @188   17 years imi - changed the merge conflict bug report to some message about the …
(edit) @113   18 years imi fixed i18n messages (cleanup)
(edit) @104   18 years imi - started i18n - started "download incomplete ways" action - added …
(edit) @102   18 years imi - added more timestamp formats to GeoImage - date import (all ISO …
(add) @86   18 years imi - added conflicts and resolve conflict dialog This is one of those …
Note: See TracRevisionLog for help on using the revision log.