[X2Go-Commits] [nx-libs] 20/108: Merge branch 'uli42-pr/decode_options' 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 930bd283339d899aa0e2e521521ec56959f2a72c
Merge: fad80bc 30a9627
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Aug 24 11:55:24 2018 +0200

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

 nx-X11/programs/Xserver/hw/nxagent/Args.c        | 63 ++++++++++++++++++------
 nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 |  5 ++
 2 files changed, 54 insertions(+), 14 deletions(-)

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