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

[git-admin]

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 71d157868807dd0342b4473fdbfbe810d9a667bd
Merge: a70d8ca 18630e5
Author: Mihai Moldovan 
Date:   Wed Mar 7 22:02:40 2018 +0100

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

 Makefile|   2 +-
 nx-X11/programs/Xserver/Xext/saver.c|   2 +
 nx-X11/programs/Xserver/hw/nxagent/Init.c   |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Screen.c | 113 
 nxcomp/configure.ac |   2 +-
 nxcompshad/configure.ac |   2 +-
 6 files changed, 87 insertions(+), 36 deletions(-)


--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/nx-libs.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

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

[git-admin]

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 e8859e090edb911494023bf224f6654aed66be9c
Merge: 2e64034 56dbc21
Author: Mihai Moldovan 
Date:   Wed Dec 27 19:50:46 2017 +0100

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

 nxcomp/src/Log.h | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/nx-libs.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits