[X2Go-Commits] [nx-libs] 26/30: Merge branch 'uli42-pr/fix_xfont2' 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 fd9de0086d10ee236dd24d51d93f60edf52cd89c
Merge: c86a119 416f8c4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 3 16:35:41 2018 +0200

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

 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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