[X2Go-Commits] [nx-libs] 63/108: Merge branch 'uli42-pr/clipboard_debug' 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 master
in repository nx-libs.

commit 2804320164cc0c0cc16741ca89eec8ba860723f3
Merge: 2eb4a65 60bce14
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Oct 27 20:56:24 2018 +0200

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

 nx-X11/programs/Xserver/hw/nxagent/Clipboard.c  | 569 ++++++++++++++++--------
 nx-X11/programs/Xserver/hw/nxagent/NXproperty.c |  25 +-
 nx-X11/programs/Xserver/hw/nxagent/Utils.h      |   2 +
 3 files changed, 411 insertions(+), 185 deletions(-)

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