[X2Go-Commits] [python-x2go] 04/04: Merge branch 'personal/sunweaver/nxproxy-on-darwin' into 'master'

[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 python-x2go.

commit 00c81d4c364d7178259e7378b903a59f77441422
Merge: 74adacb 2f9fbe8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jun 20 19:43:09 2024 +0000

    Merge branch 'personal/sunweaver/nxproxy-on-darwin' into 'master'
    
    x2go/backends/proxy/{nx3,kdrive}.py: Mac OS X support for launch nxproxy/x2gokdriveclient
    
    See merge request x2go/client/libs/python-x2go!6

 x2go/backends/proxy/kdrive.py | 7 +++++++
 x2go/backends/proxy/nx3.py    | 5 +++++
 2 files changed, 12 insertions(+)

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