[X2Go-Commits] [nx-libs] 20/38: Merge branch 'sunweaver-pr/nomagicpixel' 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 164263e1a12fc8a3a496739799cb60d547857f0a
Merge: 05152b7 8d00456
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Feb 26 01:09:05 2018 +0100

    Merge branch 'sunweaver-pr/nomagicpixel' into 3.6.x
    
    Attributes GH PR #658: https://github.com/ArcticaProject/nx-libs/pull/658
    
    Fixes: ArcticaProject/nx-libs#657

 nx-X11/programs/Xserver/hw/nxagent/Args.c        | 18 ++++++++++++++++++
 nx-X11/programs/Xserver/hw/nxagent/Events.c      |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Options.c     |  2 ++
 nx-X11/programs/Xserver/hw/nxagent/Options.h     |  6 ++++++
 nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 |  7 +++++++
 nxcomp/src/Loop.cpp                              |  3 ++-
 nxcomp/src/Misc.cpp                              |  1 +
 nxproxy/man/nxproxy.1                            |  1 +
 8 files changed, 38 insertions(+), 2 deletions(-)

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