[X2Go-Commits] [nx-libs] 03/04: Merge branch 'sunweaver-pr/more-X-memory-macro-fixes' into 3.6.x
git-admin at x2go.org
git-admin at x2go.org
Fri Dec 15 11:35:53 CET 2017
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 4cca1b4bd38e275f3c95bbfe526b229b3a7b8397
Merge: 8cca3f0 5597f2e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Dec 15 11:15:22 2017 +0100
Merge branch 'sunweaver-pr/more-X-memory-macro-fixes' into 3.6.x
Attributes GH PR #605: https://github.com/ArcticaProject/nx-libs/pull/605
Reviewed-by: Ulrich Sibiller <uli42 at gmx.de> -- Thu, 14 Dec 2017 13:15:12 +0000
nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 6 +-
.../programs/Xserver/hw/nxagent/compext/Bitmap.c | 2 +-
.../programs/Xserver/hw/nxagent/compext/Compext.c | 218 ++++++++++-----------
.../programs/Xserver/hw/nxagent/compext/Compext.h | 7 -
nx-X11/programs/Xserver/hw/nxagent/compext/Z.c | 8 +-
5 files changed, 117 insertions(+), 124 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