[X2Go-Commits] [nx-libs] 01/01: Merge branch 'master' into 3.6.x-rpm-debug

[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-rpm-debug
in repository nx-libs.

commit 1526f9f32a2efcdb6e092ffe8ff569e9af3ad502
Merge: f9b227d fcb41e3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Dec 24 18:44:38 2017 +0100

    Merge branch 'master' into 3.6.x-rpm-debug

 nx-X11/programs/Xserver/hw/nxagent/Screen.c  |  4 +-
 nxcomp/src/ChannelEndPoint.cpp               |  6 +--
 nxcomp/src/Loop.cpp                          |  2 +
 testscripts/run-nxproxy2nxagent-on-localhost | 71 ++++++++++++------------
 testscripts/run-nxproxy2nxagent-over-network | 81 ++++++++++++++--------------
 testscripts/run-nxproxy2nxagent-over-sockets | 77 +++++++++++++-------------
 testscripts/run-nxproxy2nxproxy              | 71 ++++++++++++------------
 testscripts/run-nxproxy2nxproxy-over-sockets | 81 +++++++++++++---------------
 8 files changed, 190 insertions(+), 203 deletions(-)

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