[X2Go-Commits] [nx-libs] 05/38: Merge branch 'Ionic-bugfix/FTBFS-non-ELF' into 3.6.x

[git-admin at x2go.org]

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 a653aed4c0f0c83185fca8076559ae10553ec11f
Merge: dd1ae17 06c14b8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Feb 25 15:03:52 2018 +0100

    Merge branch 'Ionic-bugfix/FTBFS-non-ELF' into 3.6.x
    
    Attributes GH PR #663: https://github.com/ArcticaProject/nx-libs/pull/663

 m4/nx-macros.m4            | 17 +++++++++++++++++
 nxcompshad/configure.ac    |  2 ++
 nxcompshad/src/Makefile.am |  6 +++++-
 nxproxy/configure.ac       |  2 ++
 nxproxy/src/Makefile.am    |  5 +++++
 5 files changed, 31 insertions(+), 1 deletion(-)


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