[X2Go-Commits] [x2gokdrive] 02/02: Merge branch 'master' of ssh://code.x2go.org:32032/srv/git/code.x2go.org/x2gokdrive

[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 x2gokdrive.

commit 6b2e080d49b1de27d5f91ea48e0b84979aee9b3a
Merge: 703966a d4afb75
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Fri May 26 10:58:58 2023 -0600

    Merge branch 'master' of ssh://code.x2go.org:32032/srv/git/code.x2go.org/x2gokdrive

 debian/changelog                                            | 1 +
 debian/copyright                                            | 6 +++---
 testscripts/run-x2gokdriveclient-to-x2gokdrive-on-localhost | 2 +-
 testscripts/run-x2gokdriveclient-to-x2gokdrive-over-network | 2 +-
 x2gokdrive.h                                                | 2 +-
 x2gokdrivecursor.c                                          | 2 +-
 x2gokdriveinit.c                                            | 2 +-
 x2gokdriveremote.c                                          | 2 +-
 x2gokdriveremote.h                                          | 2 +-
 x2gokdriveselection.c                                       | 2 +-
 x2gokdriveselection.h                                       | 2 +-
 11 files changed, 13 insertions(+), 12 deletions(-)


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