[X2Go-Commits] [nx-libs] 01/01: Merge branch '3.6.x' into 3.6.x-rpm-debug
git-admin at x2go.org
git-admin at x2go.org
Sat Dec 30 03:36:57 CET 2017
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 0a2b0a7e17adc15121bee102241782e2127a4995
Merge: 95e94c2 e13e31f
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sat Dec 30 03:36:31 2017 +0100
Merge branch '3.6.x' into 3.6.x-rpm-debug
nxcomp/src/Auth.cpp | 14 +---
nxcomp/src/ChannelEndPoint.cpp | 44 +++++++----
nxcomp/src/Children.cpp | 19 +++--
nxcomp/src/EncodeBuffer.cpp | 17 ++++-
nxcomp/src/Loop.cpp | 170 +++++++++++++++++++++++++++--------------
nxcomp/src/Proxy.cpp | 20 ++---
6 files changed, 175 insertions(+), 109 deletions(-)
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list