[X2Go-Commits] [nx-libs] 19/19: Merge branch 'uli42-pr/fix_abstract' 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 e13e31f752c0b204f964ee1df272a6b31ce51189
Merge: 2d44051 367bec5
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Dec 30 03:31:20 2017 +0100

    Merge branch 'uli42-pr/fix_abstract' into 3.6.x
    
    Attributes GH PR #615: https://github.com/ArcticaProject/nx-libs/pull/615
    
    Fixes: ArcticaProject/nx-libs#612
    Fixes: ArcticaProject/nx-libs#572

 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