[X2Go-Commits] [nx-libs] 21/23: Merge branch 'uli42-pr/some_cleanups' into 3.6.x
git-admin at x2go.org
git-admin at x2go.org
Wed Feb 7 20:08:36 CET 2018
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 b1c42dc98bea8b99eb8a2b1618421bdb698cf690
Merge: 995350d 7db6cff
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Feb 5 13:02:30 2018 +0100
Merge branch 'uli42-pr/some_cleanups' into 3.6.x
Attributes GH PR #626: https://github.com/ArcticaProject/nx-libs/pull/626
nx-X11/programs/Xserver/hw/nxagent/Client.c | 4 ++--
nx-X11/programs/Xserver/hw/nxagent/Composite.c | 4 ++--
nx-X11/programs/Xserver/hw/nxagent/Dialog.c | 2 +-
nx-X11/programs/Xserver/hw/nxagent/Events.c | 7 ++++---
nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 10 +++++-----
nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 13 +++++++------
nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 4 ++--
nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 20 ++++++++++----------
nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 2 +-
nx-X11/programs/Xserver/hw/nxagent/Screen.c | 2 +-
nx-X11/programs/Xserver/hw/nxagent/Splash.c | 12 ++++++------
nx-X11/programs/Xserver/hw/nxagent/Split.c | 14 +++++++-------
nx-X11/programs/Xserver/hw/nxagent/Window.c | 6 +++---
13 files changed, 51 insertions(+), 49 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