[X2Go-Commits] [nx-libs] 106/108: Merge branch 'uli42-pr/xkb_1.3.0.0' into 3.6.x
git-admin at x2go.org
git-admin at x2go.org
Fri Nov 9 20:36:01 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository nx-libs.
commit fccef5fc5794c3aab5c28dbe354c3dc3a86cc07b
Merge: 122db3f 3965f24
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Nov 9 15:33:02 2018 +0100
Merge branch 'uli42-pr/xkb_1.3.0.0' into 3.6.x
Attributes GH PR #717: https://github.com/ArcticaProject/nx-libs/pull/717
Makefile | 17 +-
debian/control | 1 +
nx-X11/config/cf/Imake.tmpl | 8 +
nx-X11/programs/Xserver/code-versions.txt | 2 +-
nx-X11/programs/Xserver/hw/nxagent/Events.c | 26 +-
nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 263 +----
nx-X11/programs/Xserver/include/xkbfile.h | 32 +-
nx-X11/programs/Xserver/include/xkbsrv.h | 3 +-
nx-X11/programs/Xserver/xkb/Imakefile | 18 +-
nx-X11/programs/Xserver/xkb/XKBMAlloc.c | 2 +-
nx-X11/programs/Xserver/xkb/XKBMisc.c | 7 +-
nx-X11/programs/Xserver/xkb/ddxBeep.c | 1 +
nx-X11/programs/Xserver/xkb/ddxInit.c | 45 -
nx-X11/programs/Xserver/xkb/ddxKeyClick.c | 49 -
nx-X11/programs/Xserver/xkb/ddxKillSrv.c | 5 -
nx-X11/programs/Xserver/xkb/ddxList.c | 55 +-
nx-X11/programs/Xserver/xkb/ddxLoad.c | 350 +------
nx-X11/programs/Xserver/xkb/ddxPrivate.c | 5 -
nx-X11/programs/Xserver/xkb/ddxVT.c | 5 -
nx-X11/programs/Xserver/xkb/maprules.c | 16 +-
nx-X11/programs/Xserver/xkb/xkb.c | 298 +++---
nx-X11/programs/Xserver/xkb/xkbAccessX.c | 6 +-
nx-X11/programs/Xserver/xkb/xkbActions.c | 4 -
nx-X11/programs/Xserver/xkb/xkbEvents.c | 4 +
nx-X11/programs/Xserver/xkb/xkbInit.c | 11 +-
nx-X11/programs/Xserver/xkb/xkbLEDs.c | 24 +-
nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c | 4 -
nx-X11/programs/Xserver/xkb/xkbUtils.c | 6 +-
nx-X11/programs/Xserver/xkb/xkbfmisc.c | 456 ++++++++-
nx-X11/programs/Xserver/xkb/xkbout.c | 1047 +++++++++++++++++++
nx-X11/programs/Xserver/xkb/xkbtext.c | 1325 +++++++++++++++++++++++++
nx-X11/programs/Xserver/xkb/xkmread.c | 94 +-
nx-libs.spec | 2 +
33 files changed, 3116 insertions(+), 1075 deletions(-)
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list