[X2Go-Commits] [nx-libs] 09/14: Merge branch 'uli42-pr/fix_font_defines_once_more2' 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 master
in repository nx-libs.

commit 1a429016cfea09abe0255dd85a3cff4c7811c287
Merge: 93c9b88 f78a8b3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Nov 11 15:50:21 2018 +0100

    Merge branch 'uli42-pr/fix_font_defines_once_more2' into 3.6.x
    
    Attributes GH PR #736: https://github.com/ArcticaProject/nx-libs/pull/736

 Makefile                       | 105 ++++++++++++++++++++---------------------
 nx-X11/config/cf/nxcompile.def |  30 ++++++++++++
 nx-X11/config/cf/xorg.cf       |   2 +
 3 files changed, 83 insertions(+), 54 deletions(-)

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