This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit 7ff14e3651e322914c34ca6dc0bb5b1b6da0a552 Merge: 0794cad 2d44051 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Dec 28 19:34:17 2017 +0100 Merge branch 'arctica-3.6.x' into 3.6.x-rpm-debug nx-X11/programs/Xserver/GL/glx/glxcmds.c | 28 ++++----- nx-X11/programs/Xserver/Xext/dpms.c | 8 +-- nx-X11/programs/Xserver/Xext/shape.c | 18 +++--- nx-X11/programs/Xserver/Xext/xtest.c | 4 +- nx-X11/programs/Xserver/dix/colormap.c | 6 +- nx-X11/programs/Xserver/dix/devices.c | 5 +- nx-X11/programs/Xserver/dix/dispatch.c | 80 +++++++++++-------------- nx-X11/programs/Xserver/dix/pixmap.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXwindow.c | 17 ++---- nx-X11/programs/Xserver/mi/miexpose.c | 16 ++--- nx-X11/programs/Xserver/xkb/xkb.c | 2 +- nxcompshad/src/Core.cpp | 18 ++++-- nxcompshad/src/Logger.h | 5 ++ 14 files changed, 105 insertions(+), 108 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git