[X2Go-Commits] [nx-libs] 13/219: Merge branch 'uli42-pr/short_font_code' 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 f6177d2adb9540134bf7e760fd7df4599e98a713
Merge: d94e9ba24 453edbd21
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri May 10 16:37:20 2019 +0200

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

 Makefile                                     |   5 +
 nx-X11/config/cf/Imake.tmpl                  |   5 +
 nx-X11/config/cf/host.def                    |   6 +-
 nx-X11/programs/Xserver/hw/nxagent/Font.c    | 216 +++++++++++----------------
 nx-X11/programs/Xserver/hw/nxagent/Imakefile |   1 +
 5 files changed, 105 insertions(+), 128 deletions(-)

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