[X2Go-Commits] [nx-libs] 02/02: Merge branch 'uli42-pr/reenable_xc-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 47ef330c59b80bcb8e06c90da862cbc1fe540e80
Merge: 5f9f744 4345671
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Jan 8 22:58:26 2018 +0100

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

 nx-X11/config/cf/X11.tmpl             | 1 +
 nx-X11/programs/Xserver/Xext/xcmisc.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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