This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 1918bcb9c01fcf45727b514afb8ca8d978a2bf93 Merge: a6cb858 00e3e95 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 28 00:55:13 2018 +0100 Merge branch 'uli42-pr/update_xkb' into 3.6.x Attributes GH PR #648: https://github.com/ArcticaProject/nx-libs/pull/648 nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 10 +- nx-X11/programs/Xserver/xkb/Imakefile | 20 +- nx-X11/programs/Xserver/xkb/XKBAlloc.c | 4 - nx-X11/programs/Xserver/xkb/XKBGAlloc.c | 3 - nx-X11/programs/Xserver/xkb/XKBMAlloc.c | 4 +- nx-X11/programs/Xserver/xkb/XKBMisc.c | 2 - nx-X11/programs/Xserver/xkb/ddxConfig.c | 208 ---- nx-X11/programs/Xserver/xkb/ddxKillSrv.c | 18 +- nx-X11/programs/Xserver/xkb/ddxPrivate.c | 24 - nx-X11/programs/Xserver/xkb/ddxVT.c | 20 - nx-X11/programs/Xserver/xkb/maprules.c | 19 +- nx-X11/programs/Xserver/xkb/xkb.c | 2 +- nx-X11/programs/Xserver/xkb/xkbInit.c | 67 +- nx-X11/programs/Xserver/xkb/xkbUtils.c | 6 + nx-X11/programs/Xserver/xkb/xkbconfig.c | 6 + nx-X11/programs/Xserver/xkb/xkberrs.c | 2 - nx-X11/programs/Xserver/xkb/xkbfmisc.c | 484 +------- nx-X11/programs/Xserver/xkb/xkbout.c | 1051 ----------------- nx-X11/programs/Xserver/xkb/xkbtext.c | 1326 ---------------------- nx-X11/programs/Xserver/xkb/xkmread.c | 98 +- 20 files changed, 160 insertions(+), 3214 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git