[X2Go-Commits] [nx-libs] 01/01: Merge branch '3.6.x' into 3.6.x-rpm-debug

[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-rpm-debug
in repository nx-libs.

commit b4fb15ddfe3c9f62d4e96c65ef37a4a7dbcec16a
Merge: e372754 7af47b5
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Feb 9 03:47:22 2018 +0100

    Merge branch '3.6.x' into 3.6.x-rpm-debug

 nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

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