[X2Go-Commits] [nx-libs] 108/108: Merge branch 'uli42-pr/Xext-1.4.2' into 3.6.x

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit d2dae84b3d8daf98062680a31663690718d9e867
Merge: fccef5f 49607e9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 9 15:53:42 2018 +0100

    Merge branch 'uli42-pr/Xext-1.4.2' into 3.6.x
    
    Attributes GH PR #735: https://github.com/ArcticaProject/nx-libs/pull/735

 nx-X11/programs/Xserver/Xext/dpms.c           |   7 +-
 nx-X11/programs/Xserver/Xext/panoramiX.c      |  46 +-----
 nx-X11/programs/Xserver/Xext/panoramiX.h      |  13 --
 nx-X11/programs/Xserver/Xext/panoramiXSwap.c  |   4 +
 nx-X11/programs/Xserver/Xext/panoramiXh.h     |   5 +-
 nx-X11/programs/Xserver/Xext/panoramiXprocs.c |   8 +-
 nx-X11/programs/Xserver/Xext/saver.c          |  15 +-
 nx-X11/programs/Xserver/Xext/shm.c            |  20 +--
 nx-X11/programs/Xserver/Xext/shmint.h         |   2 -
 nx-X11/programs/Xserver/Xext/sleepuntil.c     |   1 -
 nx-X11/programs/Xserver/Xext/sync.c           |  24 ++--
 nx-X11/programs/Xserver/Xext/xf86bigfont.c    |   1 +
 nx-X11/programs/Xserver/Xext/xres.c           |  64 ++++++++-
 nx-X11/programs/Xserver/Xext/xtest.c          |   6 +-
 nx-X11/programs/Xserver/Xext/xvdisp.c         |  24 ++--
 nx-X11/programs/Xserver/Xext/xvmain.c         |   4 +-
 nx-X11/programs/Xserver/Xext/xvmc.c           |   2 +-
 nx-X11/programs/Xserver/code-versions.txt     |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/NXshm.c    | 165 +++++++++++++++-------
 nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c | 195 +++++++++++++-------------
 nx-X11/programs/Xserver/include/inputstr.h    |   5 +
 21 files changed, 349 insertions(+), 264 deletions(-)

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