[X2Go-Commits] [nx-libs] 02/02: Merge branch 'uli42-pr/silence_nxcompshad_warnings' 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 2d44051aad601e074790eaf482ef09090131ca5d
Merge: 061c357 2cade63
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Dec 28 19:32:22 2017 +0100

    Merge branch 'uli42-pr/silence_nxcompshad_warnings' into 3.6.x
    
    Fixes: ArcticaProject/nx-libs#572

 nxcompshad/src/Core.cpp | 18 ++++++++++++++----
 nxcompshad/src/Logger.h |  5 +++++
 2 files changed, 19 insertions(+), 4 deletions(-)

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