This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 122db3fde2b934df206567abc0c8b431962ce4b3 Merge: 70b4946 266c3d6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Nov 1 20:12:44 2018 +0100 Merge branch 'uli42-pr/Xi-1.2.0' into 3.6.x Attributes GH PR #734: https://github.com/ArcticaProject/nx-libs/pull/734 nx-X11/programs/Xserver/Xi/allowev.c | 1 - nx-X11/programs/Xserver/Xi/chgdctl.c | 1 - nx-X11/programs/Xserver/Xi/chgfctl.c | 1 - nx-X11/programs/Xserver/Xi/chgkbd.c | 1 - nx-X11/programs/Xserver/Xi/chgkmap.c | 1 - nx-X11/programs/Xserver/Xi/chgprop.c | 1 - nx-X11/programs/Xserver/Xi/chgptr.c | 1 - nx-X11/programs/Xserver/Xi/closedev.c | 1 - nx-X11/programs/Xserver/Xi/devbell.c | 1 - nx-X11/programs/Xserver/Xi/exevents.c | 18 ++++++++++++++++++ nx-X11/programs/Xserver/Xi/extinit.c | 10 ++++------ nx-X11/programs/Xserver/Xi/getbmap.c | 1 - nx-X11/programs/Xserver/Xi/getdctl.c | 1 - nx-X11/programs/Xserver/Xi/getfctl.c | 1 - nx-X11/programs/Xserver/Xi/getfocus.c | 1 - nx-X11/programs/Xserver/Xi/getkmap.c | 1 - nx-X11/programs/Xserver/Xi/getmmap.c | 1 - nx-X11/programs/Xserver/Xi/getprop.c | 1 - nx-X11/programs/Xserver/Xi/getselev.c | 1 - nx-X11/programs/Xserver/Xi/getvers.c | 1 - nx-X11/programs/Xserver/Xi/grabdev.c | 1 - nx-X11/programs/Xserver/Xi/grabdevb.c | 1 - nx-X11/programs/Xserver/Xi/grabdevk.c | 1 - nx-X11/programs/Xserver/Xi/gtmotion.c | 4 +--- nx-X11/programs/Xserver/Xi/listdev.c | 1 - nx-X11/programs/Xserver/Xi/opendev.c | 3 +-- nx-X11/programs/Xserver/Xi/selectev.c | 1 - nx-X11/programs/Xserver/Xi/sendexev.c | 1 - nx-X11/programs/Xserver/Xi/setbmap.c | 1 - nx-X11/programs/Xserver/Xi/setdval.c | 1 - nx-X11/programs/Xserver/Xi/setfocus.c | 1 - nx-X11/programs/Xserver/Xi/setmmap.c | 1 - nx-X11/programs/Xserver/Xi/setmode.c | 1 - nx-X11/programs/Xserver/Xi/stubs.c | 1 - nx-X11/programs/Xserver/Xi/ungrdev.c | 1 - nx-X11/programs/Xserver/Xi/ungrdevb.c | 1 - nx-X11/programs/Xserver/Xi/ungrdevk.c | 1 - nx-X11/programs/Xserver/code-versions.txt | 2 +- 38 files changed, 25 insertions(+), 45 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git