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 a9787fc2e79065e8f56fdace41f4e565667c22bb Merge: b40dec9 6dcfcba Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 26 05:12:20 2018 +0100 Merge branch 'uli42-pr/update_dix' into 3.6.x Attributes GH PR #646: https://github.com/ArcticaProject/nx-libs/pull/646 nx-X11/programs/Xserver/dix/atom.c | 2 + nx-X11/programs/Xserver/dix/colormap.c | 10 +++ nx-X11/programs/Xserver/dix/devices.c | 41 +----------- nx-X11/programs/Xserver/dix/dispatch.c | 21 +++++-- nx-X11/programs/Xserver/dix/events.c | 27 +++----- nx-X11/programs/Xserver/dix/extension.c | 51 ++++++++++++++- nx-X11/programs/Xserver/dix/ffs.c | 2 + nx-X11/programs/Xserver/dix/globals.c | 13 ++-- nx-X11/programs/Xserver/dix/main.c | 3 +- nx-X11/programs/Xserver/dix/pixmap.c | 9 +++ nx-X11/programs/Xserver/dix/privates.c | 58 +++++++++++++++++ nx-X11/programs/Xserver/dix/swaprep.c | 6 +- nx-X11/programs/Xserver/dix/swapreq.c | 2 - nx-X11/programs/Xserver/dix/window.c | 80 ++++++++++++++++++++---- nx-X11/programs/Xserver/dix/xpstubs.c | 2 + nx-X11/programs/Xserver/hw/nxagent/NXevents.c | 5 +- nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 8 +-- nx-X11/programs/Xserver/hw/nxagent/NXwindow.c | 56 ++++++++++------- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 5 -- nx-X11/programs/Xserver/include/colormapst.h | 19 +++++- nx-X11/programs/Xserver/include/extension.h | 12 ++++ nx-X11/programs/Xserver/include/extnsionst.h | 3 + nx-X11/programs/Xserver/include/opaque.h | 2 +- nx-X11/programs/Xserver/include/pixmapstr.h | 13 +++- nx-X11/programs/Xserver/include/window.h | 7 +++ nx-X11/programs/Xserver/os/utils.c | 2 - 26 files changed, 328 insertions(+), 131 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git