Changeset 27868 in osm for applications/editors/josm


Ignore:
Timestamp:
2012-02-18T22:25:00+01:00 (13 years ago)
Author:
stoecker
Message:

fix conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java

    r27852 r27868  
    5252        public RoadSignAction() {
    5353            super(tr("Roadsign tagging"), "pref/roadsigns-small", tr("Add tags by clicking on road signs"),
    54                     Shortcut.registerShortcut("plugin:roadsigns:dialog", tr("Roadsigns plugin: open dialog"), KeyEvent.VK_R, Shortcut.ALT), false);
     54                    Shortcut.registerShortcut("plugin:roadsigns:dialog", tr("Roadsigns plugin: open dialog"), KeyEvent.VK_Q, Shortcut.ALT_SHIFT), false);
    5555        }
    5656
Note: See TracChangeset for help on using the changeset viewer.