diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-18 08:47:40 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-18 08:47:40 +0100 |
| commit | 66315e4f34417a794d3cc5f4145fe2ea35850e68 (patch) | |
| tree | d5ea4904c74c461ecb4047dba6ba45a316b54bff /nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | |
| parent | a3dc87d6b45c09a1c8959976b18513635fdca225 (diff) | |
| parent | fc29077594fa20fb5243cfa8b5daf073d357b020 (diff) | |
| download | nx-libs-66315e4f34417a794d3cc5f4145fe2ea35850e68.tar.gz nx-libs-66315e4f34417a794d3cc5f4145fe2ea35850e68.tar.bz2 nx-libs-66315e4f34417a794d3cc5f4145fe2ea35850e68.zip | |
Merge branch 'uli42-pr/session_types' into 3.6.x
Attributes GH PR #776: https://github.com/ArcticaProject/nx-libs/pull/776
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Keyboard.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index af27c6e28..05adab494 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -870,8 +870,7 @@ XkbError: * when cloning we do not want X2Go to set the keyboard * via a keyboard file generated by nxagent. The defined * method for switching that off is the creation of a dir - * instead of a file. Which is achieved by passing NULL to - * nxagentWriteKeyboardFile. + * instead of a file. */ if (nxagentX2go == 1) nxagentWriteKeyboardDir(); |