Changeset 27866 in osm for applications/editors/josm/plugins/routing/src/com/innovant

Timestamp:

2012-02-18T22:19:33+01:00 (13 years ago)

Author:

stoecker

Message:

fix conflict

File:

• applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java (modified) (1 diff)

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java

@@ -68 +68 @@
     public RoutingDialog() {
         super(tr("Routing"), "routing", tr("Open a list of routing nodes"),
-                Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Routing")), KeyEvent.VK_R, Shortcut.ALT), 150);
+                Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Routing")), KeyEvent.VK_R, Shortcut.ALT_CTRL_SHIFT), 150);
         model = new DefaultListModel();
         createLayout(getJScrollPane(), false, null);