[X2Go-Commits] [nx-libs] 429/429: Merge branch 'uli42-pr/many_clipboard_fixes' 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 b7034724abb859db36a3fa4312e4827141114f45
Merge: b67b910a6 31057d00b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Oct 18 09:28:50 2021 +0200

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

 nx-X11/programs/Xserver/hw/nxagent/Args.c        |   19 +
 nx-X11/programs/Xserver/hw/nxagent/Atoms.c       |   71 +-
 nx-X11/programs/Xserver/hw/nxagent/Atoms.h       |   18 +-
 nx-X11/programs/Xserver/hw/nxagent/Clipboard.c   | 3099 +++++++++++++++-------
 nx-X11/programs/Xserver/hw/nxagent/Clipboard.h   |    7 +-
 nx-X11/programs/Xserver/hw/nxagent/Events.c      |  119 +-
 nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c  |   15 +-
 nx-X11/programs/Xserver/hw/nxagent/NXevents.c    |    7 +-
 nx-X11/programs/Xserver/hw/nxagent/Options.c     |    1 +
 nx-X11/programs/Xserver/hw/nxagent/Options.h     |    7 +
 nx-X11/programs/Xserver/hw/nxagent/Trap.c        |    8 -
 nx-X11/programs/Xserver/hw/nxagent/Trap.h        |    7 -
 nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 |   13 +
 13 files changed, 2284 insertions(+), 1107 deletions(-)

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