[X2Go-Commits] [nx-libs] 07/28: Merge branch 'uli42-pr/extend_x2go_check' 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 1ef24c379f8d142180f77ecfe2ab43093c3b7a64
Merge: c26b9b291 3d76ed45e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Oct 30 21:16:27 2021 +0200

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

 nx-X11/programs/Xserver/hw/nxagent/Args.c |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Init.c | 38 ++++++++++++++++++++++++++++---
 nx-X11/programs/Xserver/hw/nxagent/Init.h |  2 +-
 3 files changed, 37 insertions(+), 5 deletions(-)

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