[X2Go-Commits] [nx-libs] 01/01: Merge branch 'Ionic-feature/use-libtirpc' 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 3b05d0de6476f2af7fd7a30be9b1c5536763e737
Merge: 15e9555 2e1e915
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 15 21:30:43 2018 +0100

    Merge branch 'Ionic-feature/use-libtirpc' into 3.6.x
    
    Attributes GH PR #676: https://github.com/ArcticaProject/nx-libs/pull/676

 Makefile                             | 10 ++++++----
 nx-X11/config/cf/Imake.tmpl          |  3 +++
 nx-X11/config/cf/README              |  1 +
 nx-X11/programs/Xserver/Imakefile    | 20 ++++++++++++++------
 nx-X11/programs/Xserver/os/Imakefile |  8 ++++++++
 nx-libs.spec                         | 24 +++++++++++++++---------
 6 files changed, 47 insertions(+), 19 deletions(-)

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