[X2Go-Commits] [nx-libs] 279/429: Merge branch 'uli42-pr/dialog_text' 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 9815f32d5c7c397c5a27a53764565beda2d007c2
Merge: c3476b6a8 5dcb19b3d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jun 8 08:07:25 2021 +0200

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

 nx-X11/programs/Xserver/hw/nxagent/Dialog.h    |  4 +-
 nx-X11/programs/Xserver/hw/nxagent/Keystroke.c |  4 +-
 nxcomp/src/Children.cpp                        | 60 +++++++++++++++++++-------
 3 files changed, 47 insertions(+), 21 deletions(-)

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