Changeset 4951 in josm for trunk/src/org


Ignore:
Timestamp:
2012-02-16T11:09:14+01:00 (8 years ago)
Author:
stoecker
Message:

fix shortcut conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

    r4363 r4951  
    109109    public ConflictDialog() {
    110110        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);
    112113
    113114        build();
Note: See TracChangeset for help on using the changeset viewer.