[X2Go-Commits] [nx-libs] 05/54: Merge branch 'uli42-pr/misc' 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 b61934be2e9b4a8d3112270b0e691d47f99ba39f
Merge: 427ac34 16cd2bb
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 13 12:32:06 2019 +0100

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

 nx-X11/programs/Xserver/hw/nxagent/Args.c       |  32 ++++----
 nx-X11/programs/Xserver/hw/nxagent/Composite.c  |   6 +-
 nx-X11/programs/Xserver/hw/nxagent/Cursor.c     |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Display.c    |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Drawable.c   |  34 ++++----
 nx-X11/programs/Xserver/hw/nxagent/Events.c     |  98 +++++++++++------------
 nx-X11/programs/Xserver/hw/nxagent/Extensions.c |  18 ++---
 nx-X11/programs/Xserver/hw/nxagent/GC.c         |  26 +++---
 nx-X11/programs/Xserver/hw/nxagent/GCOps.c      |  32 ++++----
 nx-X11/programs/Xserver/hw/nxagent/Handlers.c   |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Image.c      |  36 ++++-----
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c   |   8 +-
 nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c |   6 +-
 nx-X11/programs/Xserver/hw/nxagent/NXevents.c   |   4 +-
 nx-X11/programs/Xserver/hw/nxagent/NXglxext.c   |   4 +-
 nx-X11/programs/Xserver/hw/nxagent/NXproperty.c |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/NXrender.c   |   8 +-
 nx-X11/programs/Xserver/hw/nxagent/NXshm.c      |  18 ++---
 nx-X11/programs/Xserver/hw/nxagent/NXwindow.c   |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c   |   8 +-
 nx-X11/programs/Xserver/hw/nxagent/Pixels.h     |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Pixmap.c     |  18 ++---
 nx-X11/programs/Xserver/hw/nxagent/Pointer.c    |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c  |  10 +--
 nx-X11/programs/Xserver/hw/nxagent/Render.c     |   6 +-
 nx-X11/programs/Xserver/hw/nxagent/Rootless.c   |   4 +-
 nx-X11/programs/Xserver/hw/nxagent/Screen.c     | 100 ++++++++++++------------
 nx-X11/programs/Xserver/hw/nxagent/Trap.c       |  26 +++---
 nx-X11/programs/Xserver/hw/nxagent/Trap.h       |   8 ++
 nx-X11/programs/Xserver/hw/nxagent/Window.c     |  40 +++++-----
 nx-X11/programs/Xserver/randr/rrdispatch.c      |   4 -
 31 files changed, 283 insertions(+), 285 deletions(-)

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