[X2Go-Commits] [nx-libs] 04/23: Merge branch 'uli42-pr/shm_missing_code' 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 995350d14335d8b5ef52dba47c7ae8d942901b10
Merge: ef0a3d6 9fb582f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 5 12:14:39 2018 +0100

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

 nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

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