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 48b914810291f405fd5ba8e9db9dfab3ccaf906c Merge: 6cd4f1232 252b86ee2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 4 13:38:30 2020 +0100 Merge branch 'uli42-pr/various5' into 3.6.x Attributes GH PR #963: https://github.com/ArcticaProject/nx-libs/pull/963 nx-X11/programs/Xserver/Xext/panoramiX.c | 14 +- nx-X11/programs/Xserver/hw/nxagent/Atoms.c | 5 +- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 13 +- nx-X11/programs/Xserver/hw/nxagent/Events.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/GCs.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 74 +++--- .../programs/Xserver/hw/nxagent/compext/Compext.c | 261 ++++++++------------- nx-X11/programs/Xserver/hw/nxagent/compext/Jpeg.c | 6 +- nx-X11/programs/Xserver/hw/nxagent/compext/Png.c | 28 ++- nx-X11/programs/Xserver/hw/nxagent/compext/Z.c | 6 +- nx-libs.spec | 5 + nxcomp/src/Channel.h | 8 +- nxcomp/src/Log.h | 14 +- 13 files changed, 190 insertions(+), 250 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git