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 c86a119da96c73914de91935db1daff04edf3b0b Merge: b1e4d6e b82a6a1 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jul 3 16:32:11 2018 +0200 Merge branch 'uli42-gh-sunweaver/pr/xserver-xkb-cleanup' into 3.6.x Attributes GH PR #706: https://github.com/ArcticaProject/nx-libs/pull/706 Makefile | 1 - debian/nxagent.install | 1 - debian/nxagent.postinst | 3 + debian/nxagent.postrm | 3 + debian/nxagent.preinst | 3 + etc/nxagent.keyboard | 1 - nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 115 +-- nx-X11/programs/Xserver/include/xkbsrv.h | 86 -- nx-X11/programs/Xserver/xkb/Imakefile | 4 +- nx-X11/programs/Xserver/xkb/XKBAlloc.c | 155 +-- nx-X11/programs/Xserver/xkb/XKBMAlloc.c | 77 +- nx-X11/programs/Xserver/xkb/XKBMisc.c | 181 +--- nx-X11/programs/Xserver/xkb/ddxLEDs.c | 2 +- nx-X11/programs/Xserver/xkb/ddxLoad.c | 6 +- nx-X11/programs/Xserver/xkb/xkb.c | 61 +- nx-X11/programs/Xserver/xkb/xkb.h | 39 - nx-X11/programs/Xserver/xkb/xkbAccessX.c | 6 +- nx-X11/programs/Xserver/xkb/xkbActions.c | 6 +- nx-X11/programs/Xserver/xkb/xkbDflts.h | 37 - nx-X11/programs/Xserver/xkb/xkbEvents.c | 44 +- nx-X11/programs/Xserver/xkb/xkbInit.c | 71 +- nx-X11/programs/Xserver/xkb/xkbLEDs.c | 446 +++----- nx-X11/programs/Xserver/xkb/xkbUtils.c | 73 -- nx-X11/programs/Xserver/xkb/xkbconfig.c | 1341 ------------------------- nx-X11/programs/Xserver/xkb/xkberrs.c | 31 - nx-X11/programs/Xserver/xkb/xkmread.c | 12 - nx-libs.spec | 1 - 27 files changed, 207 insertions(+), 2599 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git