[X2Go-Commits] [nx-libs] 50/51: Merge branch 'theqvd-unix_socket_forwarding' 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 26e483d495cb06b9af5d04b44ae7176885433072
Merge: ca8236e 889de46
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jan 25 16:37:29 2019 +0100

    Merge branch 'theqvd-unix_socket_forwarding' into 3.6.x
    
    Attributes GH PR #764: https://github.com/ArcticaProject/nx-libs/pull/764

 nxcomp/src/ChannelEndPoint.cpp | 6 +++---
 nxcomp/src/Loop.cpp            | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

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