[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 e3727549031bfad8dc2a4e27ed91ff521625361b
Merge: bcff8be f76d4b5
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Feb 8 21:49:20 2018 +0100

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

 nx-X11/include/extensions/saver.h         |   4 +-
 nx-X11/include/extensions/saverproto.h    |  13 +-
 nx-X11/programs/Xserver/Xext/dpms.c       |   6 +-
 nx-X11/programs/Xserver/Xext/panoramiX.c  |  31 +++--
 nx-X11/programs/Xserver/Xext/saver.c      | 149 ++++++++++++++++++++++-
 nx-X11/programs/Xserver/Xext/sleepuntil.c |   2 +-
 nx-X11/programs/Xserver/Xext/sync.c       |  12 +-
 nx-X11/programs/Xserver/Xext/xres.c       |   4 +-
 nx-X11/programs/Xserver/Xext/xvmain.c     |   6 +-
 nx-X11/programs/Xserver/dix/Imakefile     |   2 +-
 nx-X11/programs/Xserver/dix/globals.c     |   4 +
 nx-X11/programs/Xserver/dix/main.c        |   6 -
 nx-X11/programs/Xserver/include/globals.h |   4 +
 nx-X11/programs/Xserver/os/WaitFor.c      | 193 ++++++++++++++++--------------
 14 files changed, 309 insertions(+), 127 deletions(-)

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