Changeset 4951 in josm
- Timestamp:
- 2012-02-16T11:09:14+01:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r4363 r4951 109 109 public ConflictDialog() { 110 110 super(tr("Conflict"), "conflict", tr("Resolve conflicts."), 111 Shortcut.registerShortcut("subwindow:conflict", tr("Toggle: {0}", tr("Conflict")), KeyEvent.VK_C, Shortcut.GROUP_LAYER), 100); 111 Shortcut.registerShortcut("subwindow:conflict", tr("Toggle: {0}", tr("Conflict")), 112 KeyEvent.VK_C, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 100); 112 113 113 114 build();
Note:
See TracChangeset
for help on using the changeset viewer.