Changeset 4951 in josm

Timestamp:

Feb 16, 2012 11:09:14 AM (15 months ago)

Author:

stoecker

Message:

fix shortcut conflict

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -109 +109 @@
     public ConflictDialog() {
         super(tr("Conflict"), "conflict", tr("Resolve conflicts."),
-                Shortcut.registerShortcut("subwindow:conflict", tr("Toggle: {0}", tr("Conflict")), KeyEvent.VK_C, Shortcut.GROUP_LAYER), 100);
+                Shortcut.registerShortcut("subwindow:conflict", tr("Toggle: {0}", tr("Conflict")),
+                KeyEvent.VK_C, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 100);
 
         build();