[X2Go-Commits] [nx-libs] 215/219: Merge branch 'uli42-gh-sunweaver/pr/autograb-without-inputlock' into 3.6.x
git-admin at x2go.org
git-admin at x2go.org
Sat Sep 28 12:11:10 CEST 2019
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 6bca289afd17db8e1faf3db884153a6cad40283f
Merge: daa50fd80 6181aa911
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Aug 27 14:11:53 2019 +0200
Merge branch 'uli42-gh-sunweaver/pr/autograb-without-inputlock' into 3.6.x
Attributes GH PR #835: https://github.com/ArcticaProject/nx-libs/pull/835
doc/nxagent/README.keystrokes | 3 +
etc/keystrokes.cfg | 1 +
nx-X11/programs/Xserver/hw/nxagent/Args.c | 22 +++
nx-X11/programs/Xserver/hw/nxagent/Dialog.c | 50 +++++++
nx-X11/programs/Xserver/hw/nxagent/Dialog.h | 30 +++++
nx-X11/programs/Xserver/hw/nxagent/Events.c | 163 +++++++++++++++++++++--
nx-X11/programs/Xserver/hw/nxagent/Events.h | 3 +-
nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 9 +-
nx-X11/programs/Xserver/hw/nxagent/Keystroke.h | 2 +
nx-X11/programs/Xserver/hw/nxagent/Options.c | 2 +
nx-X11/programs/Xserver/hw/nxagent/Options.h | 7 +
nx-X11/programs/Xserver/hw/nxagent/Window.c | 11 +-
nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 7 +
13 files changed, 296 insertions(+), 14 deletions(-)
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list