[X2Go-Commits] [nx-libs] 12/54: Merge branch 'uli42-pr/session_types' 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 66315e4f34417a794d3cc5f4145fe2ea35850e68
Merge: a3dc87d fc29077
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 18 08:47:40 2019 +0100

    Merge branch 'uli42-pr/session_types' into 3.6.x
    
    Attributes GH PR #776: https://github.com/ArcticaProject/nx-libs/pull/776

 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 3 +--
 nxcomp/src/Misc.cpp                           | 7 +++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

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