[X2Go-Commits] [nx-libs] 41/108: Merge branch 'uli42-pr/enableclientids' 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 master
in repository nx-libs.

commit 3dc4595560b34242fe4705af8c93d0024eeb2c56
Merge: 7392dd6 71abe0b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Oct 22 14:39:10 2018 +0200

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

 nx-X11/config/cf/X11.tmpl            | 2 +-
 nx-X11/config/cf/xorg.cf             | 2 +-
 nx-X11/programs/Xserver/include/os.h | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

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