diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-05-11 09:41:15 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-05-11 09:41:15 +0200 |
| commit | 22649369085dfaa351003ba76b7838160089f7cc (patch) | |
| tree | 1c83284c7be0c038601cfc41ad53ce9351b2e70a /nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | |
| parent | f6177d2adb9540134bf7e760fd7df4599e98a713 (diff) | |
| parent | fac36b24f55b02040bd6950d8de0385fdbb33703 (diff) | |
| download | nx-libs-22649369085dfaa351003ba76b7838160089f7cc.tar.gz nx-libs-22649369085dfaa351003ba76b7838160089f7cc.tar.bz2 nx-libs-22649369085dfaa351003ba76b7838160089f7cc.zip | |
Merge branch 'uli42-pr/small_fixes' into 3.6.x
Attributes GH PR #797: https://github.com/ArcticaProject/nx-libs/pull/797
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Keystroke.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c index 6def29ae4..3e02d318d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c @@ -113,8 +113,6 @@ struct nxagentSpecialKeystrokeMap default_map[] = { {KEYSTROKE_FULLSCREEN, ControlMask | ShiftMask, True, XK_f}, {KEYSTROKE_MINIMIZE, ControlMask, True, XK_m}, {KEYSTROKE_DEFER, ControlMask, True, XK_e}, - {KEYSTROKE_IGNORE, ControlMask, True, XK_BackSpace}, - {KEYSTROKE_IGNORE, 0, False, XK_Terminate_Server}, {KEYSTROKE_FORCE_SYNCHRONIZATION, ControlMask, True, XK_j}, #ifdef DUMP {KEYSTROKE_REGIONS_ON_SCREEN, ControlMask, True, XK_a}, |