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 b66699555d2e2503926f01a9c192481e01812399 Merge: 3523d15e2 97a69b95a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Jan 16 00:19:38 2021 +0100 Merge branch 'uli42-pr/various6' into 3.6.x Attributes GH PR #979: https://github.com/ArcticaProject/nx-libs/pull/979 nx-X11/programs/Xserver/hw/nxagent/Args.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Atoms.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Client.h | 7 +++++-- nx-X11/programs/Xserver/hw/nxagent/Display.c | 23 +++++++++++------------ nx-X11/programs/Xserver/hw/nxagent/Events.c | 2 -- nx-X11/programs/Xserver/hw/nxagent/GC.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 7 +++++-- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 1 - nx-X11/programs/Xserver/hw/nxagent/NXpicture.c | 13 ++++++------- nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Split.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Window.c | 6 ++---- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 12 +++++++++++- nxcomp/include/NX.h | 2 +- nxcomp/src/Control.h | 2 +- nxcomp/src/Message.h | 2 +- nxproxy/man/nxproxy.1 | 2 +- 18 files changed, 51 insertions(+), 42 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git