[X2Go-Commits] [nx-libs] 01/01: Merge branch 'Ionic-bugfix/rpath' into 3.6.x

Fri Jan 5 23:23:26 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 3c81899718e3429e45381beaaba58d4886a5537c
Merge: e13e31f 1c1431c
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Jan 5 23:21:52 2018 +0100

    Merge branch 'Ionic-bugfix/rpath' into 3.6.x

    Attributes GH PR #614: https://github.com/ArcticaProject/nx-libs/pull/614

    Fixes: ArcticaProject/nx-libs#610

 Makefile                          |  4 +--
 debian/rules                      |  8 +++++
 nx-X11/config/cf/Imake.rules      | 64 +++++++++++++++++++++++++++++++++++----
 nx-X11/config/cf/Imake.tmpl       |  2 ++
 nx-X11/config/cf/README           |  1 +
 nx-X11/config/cf/cross.def        |  2 ++
 nx-X11/config/cf/gnuLib.rules     | 21 +++++++++++--
 nx-X11/config/cf/lnxLib.rules     | 26 ++++++++++++++--
 nx-X11/programs/Xserver/Imakefile | 10 ++++--
 nxcompshad/src/Makefile.am        |  7 ++++-
 nxproxy/configure.ac              |  9 ++----
 nxproxy/src/Makefile.am           |  1 +
 12 files changed, 132 insertions(+), 23 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git