[X2Go-Commits] [nx-libs] 08/09: Merge branch 'uli42-pr/update_xext' into 3.6.x
git-admin at x2go.org
git-admin at x2go.org
Thu Feb 8 21:49:15 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x
in repository nx-libs.
commit aecdb52661898d0ba400a61550fa6ce9c0a4d829
Merge: cbdae3b 5ec2366
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Feb 7 23:19:33 2018 +0100
Merge branch 'uli42-pr/update_xext' into 3.6.x
Attributes GH PR #643: https://github.com/ArcticaProject/nx-libs/pull/643
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
More information about the x2go-commits
mailing list