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 68d43bb8a1983222730bb68f959c9084f39b256d Merge: f5cdd35 5f9f744 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jan 7 01:31:54 2018 +0100 Merge branch '3.6.x' into 3.6.x-rpm-debug nx-X11/programs/Xserver/hw/nxagent/Args.c | 120 +++++------------------- nx-X11/programs/Xserver/hw/nxagent/Args.h | 16 +++- nx-X11/programs/Xserver/hw/nxagent/Dialog.c | 22 ++--- nx-X11/programs/Xserver/hw/nxagent/Dialog.h | 6 +- nx-X11/programs/Xserver/hw/nxagent/Display.c | 60 ++++++------ nx-X11/programs/Xserver/hw/nxagent/Error.c | 77 +++++++-------- nx-X11/programs/Xserver/hw/nxagent/Error.h | 3 +- nx-X11/programs/Xserver/hw/nxagent/Events.c | 1 + nx-X11/programs/Xserver/hw/nxagent/Font.c | 66 ++++++------- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 40 ++++---- nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c | 14 +-- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 26 ++--- 14 files changed, 182 insertions(+), 275 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git