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 ca19c342ca6f829894fb0cdd652bd2731029084b Merge: 61013ec d088698 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 3 17:07:30 2015 +0200 Merge branch 'uli42-pr/backported_fixes' into arctica-3.6.x Attributes GH PR #50: https://github.com/ArcticaProject/nx-libs/pull/50 nx-X11/programs/Xserver/Xext/bigreq.c | 1 + nx-X11/programs/Xserver/Xext/shape.c | 2 ++ nx-X11/programs/Xserver/Xext/shm.c | 1 + nx-X11/programs/Xserver/Xext/sync.c | 1 + nx-X11/programs/Xserver/Xi/getvers.c | 1 + nx-X11/programs/Xserver/Xi/listdev.c | 3 ++- nx-X11/programs/Xserver/Xi/opendev.c | 1 + nx-X11/programs/Xserver/dix/devices.c | 2 ++ nx-X11/programs/Xserver/dix/dispatch.c | 20 +++++++++++++++- nx-X11/programs/Xserver/dix/dixfonts.c | 2 ++ nx-X11/programs/Xserver/dix/events.c | 4 ++++ nx-X11/programs/Xserver/dix/extension.c | 2 ++ nx-X11/programs/Xserver/dix/main.c | 4 ++++ nx-X11/programs/Xserver/dix/property.c | 1 + nx-X11/programs/Xserver/dix/window.c | 13 +++++++++++ nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 2 ++ nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 20 +++++++++++++++- nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c | 2 ++ nx-X11/programs/Xserver/hw/nxagent/NXevents.c | 6 +++++ nx-X11/programs/Xserver/hw/nxagent/NXextension.c | 2 ++ nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c | 3 ++- nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 1 + nx-X11/programs/Xserver/hw/nxagent/NXrender.c | 2 ++ nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 1 + nx-X11/programs/Xserver/hw/nxagent/NXwindow.c | 13 +++++++++++ nx-X11/programs/Xserver/mi/miexpose.c | 2 ++ nx-X11/programs/Xserver/randr/randr.c | 2 ++ nx-X11/programs/Xserver/randr/rrcrtc.c | 23 +----------------- nx-X11/programs/Xserver/randr/rrinfo.c | 7 +++--- nx-X11/programs/Xserver/randr/rrmode.c | 13 ++++++----- nx-X11/programs/Xserver/randr/rroutput.c | 1 + nx-X11/programs/Xserver/randr/rrscreen.c | 27 ++++++++++++++-------- nx-X11/programs/Xserver/randr/rrxinerama.c | 3 ++- nx-X11/programs/Xserver/render/render.c | 3 +++ nx-X11/programs/Xserver/xfixes/select.c | 2 ++ nx-X11/programs/Xserver/xfixes/xfixes.c | 1 + nx-X11/programs/Xserver/xkb/xkb.c | 9 ++++++++ nx-X11/programs/Xserver/xkb/xkbEvents.c | 6 +++++ 38 files changed, 164 insertions(+), 45 deletions(-) -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git