source: josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @301   17 years imi - fixed undo/redo to be global - fixed adding of objects work with …
(edit) @298   17 years imi - added license description to head of each source file
(edit) @290   17 years imi - added support for multiple data layers
(edit) @203   17 years imi - Fixed a bug in the Merger/Conflict to auto-resolve marked changes …
(edit) @155   18 years imi - added online help system
(edit) @119   18 years imi - added Annotation Preset Tester - added Language selection in …
(edit) @104   18 years imi - started i18n - started "download incomplete ways" action - added …
(edit) @100   18 years imi - fixed JOSM crash when importing GeoImages on layers without …
(edit) @98   18 years imi - added Applet version of JOSM (unfinished) - fixed display bug if …
(edit) @94   18 years imi - changed Add Way mode, so that ways can be modified - added Command …
(edit) @90   18 years imi - fixed that toggle dialog buttons are sync with the dialogs - added …
(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.