[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 d0d233f2ee546b668be9928f1b492584093342c2
Merge: 664b8ac 70e1e6a
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Jan 8 23:44:29 2018 +0100

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

 nx-X11/programs/Xserver/Xext/panoramiXSwap.c  | 4 ++--
 nx-X11/programs/Xserver/Xext/panoramiXprocs.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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