[X2Go-Commits] [nx-libs] 310/429: Merge branch 'uli42-pr/various7' 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 3.6.x
in repository nx-libs.

commit 59a0620f68e9377001f23f5f491a8b02b520d685
Merge: 6208dade8 fcc1b57fb
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jun 8 12:59:56 2021 +0200

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

 nx-X11/programs/Xserver/composite/compext.c        |   6 +
 nx-X11/programs/Xserver/hw/nxagent/Args.c          |  33 +-
 nx-X11/programs/Xserver/hw/nxagent/Atoms.c         |   7 +-
 nx-X11/programs/Xserver/hw/nxagent/Clipboard.c     |   3 +
 nx-X11/programs/Xserver/hw/nxagent/Composite.c     |  18 +-
 nx-X11/programs/Xserver/hw/nxagent/Composite.h     |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Display.c       |   4 +
 nx-X11/programs/Xserver/hw/nxagent/Error.c         | 150 +++----
 nx-X11/programs/Xserver/hw/nxagent/GCOps.c         |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Icons.h         |   2 +
 nx-X11/programs/Xserver/hw/nxagent/Image.c         |   8 +-
 nx-X11/programs/Xserver/hw/nxagent/Image.h         |   4 +-
 nx-X11/programs/Xserver/hw/nxagent/Imakefile       |   5 +-
 nx-X11/programs/Xserver/hw/nxagent/Init.c          |   6 +-
 nx-X11/programs/Xserver/hw/nxagent/Init.h          |   8 +-
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c      |   4 +-
 nx-X11/programs/Xserver/hw/nxagent/Keystroke.c     |   8 +-
 nx-X11/programs/Xserver/hw/nxagent/NXrender.c      |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Options.c       |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Pixels.h        |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c     |   2 +
 nx-X11/programs/Xserver/hw/nxagent/Render.c        |   4 +-
 nx-X11/programs/Xserver/hw/nxagent/Screen.c        |  10 +-
 nx-X11/programs/Xserver/hw/nxagent/Splash.c        |  11 +-
 nx-X11/programs/Xserver/hw/nxagent/Trap.h          |  28 +-
 nx-X11/programs/Xserver/hw/nxagent/Window.c        |  56 +--
 .../programs/Xserver/hw/nxagent/compext/Compext.c  | 452 ++++++++++++---------
 nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1   |  13 +-
 nx-X11/programs/Xserver/os/utils.c                 |   4 +-
 nxcomp/src/Misc.cpp                                |  41 +-
 nxproxy/man/nxproxy.1                              |  44 +-
 31 files changed, 542 insertions(+), 399 deletions(-)

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