[X2Go-Commits] [nx-libs] 119/219: Merge branch 'uli42-pr/fix_xkb_privates' into 3.6.x

[git-admin at x2go.org]

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 4a440feaf5c4ff7ac8d944a7a9832444fca924d3
Merge: abf374136 3aabc92cf
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jun 23 21:39:51 2019 +0200

    Merge branch 'uli42-pr/fix_xkb_privates' into 3.6.x
    
    Attributes GH PR #818: https://github.com/ArcticaProject/nx-libs/pull/818

 nx-X11/programs/Xserver/dix/devices.c         |  9 +++++++++
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c |  8 --------
 nx-X11/programs/Xserver/hw/nxagent/Pointer.c  |  8 --------
 nx-X11/programs/Xserver/xkb/xkbActions.c      | 14 ++++++++++++++
 4 files changed, 23 insertions(+), 16 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git