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

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 664b8ac6ffea7a24db51ea6ed586d15b1ca57bbd Merge: 68d43bb 47ef330 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jan 8 23:00:26 2018 +0100 Merge branch '3.6.x' into 3.6.x-rpm-debug nx-X11/config/cf/X11.tmpl | 1 + nx-X11/programs/Xserver/Xext/xcmisc.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git