[X2Go-Commits] [nx-libs] 07/54: Merge branch 'uli42-pr/revert' into 3.6.x

git-admin at x2go.org git-admin at x2go.org
Sun Mar 24 10:04:59 CET 2019


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

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

commit 24d7d0faa4b5c12c691599bf61bae5cfe1ef4120
Merge: b61934b 586742b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Feb 15 11:45:14 2019 +0100

    Merge branch 'uli42-pr/revert' into 3.6.x
    
    Attributes GH PR #773: https://github.com/ArcticaProject/nx-libs/pull/773
    
    Fixes ArcticaProject/nx-libs#772.

 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     | 52 ++++++-------
 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 +++++-----
 30 files changed, 255 insertions(+), 261 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