[X2Go-Commits] [nx-libs] 14/30: Merge branch 'uli42-pr/misc' 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 ce83b566a276797120cef5dc0269309907ba612f
Merge: 9834951 b394eac
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 3 16:20:55 2018 +0200

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

 nx-X11/programs/Xserver/dix/devices.c           | 27 ++++++++-------
 nx-X11/programs/Xserver/dix/dixfonts.c          | 16 ++++-----
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c   |  8 ++---
 nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c | 33 ++++++++----------
 nx-X11/programs/Xserver/os/io.c                 |  7 +++-
 nx-X11/programs/Xserver/xkb/xkb.c               | 45 +++++++++++--------------
 6 files changed, 64 insertions(+), 72 deletions(-)

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