[X2Go-Commits] [nx-libs] 19/23: Merge branch 'uli42-pr/cleanup_window_hints' 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 c0f67abb494b6d61dc4a67284004072570b3c5e7
Merge: 985bed9 9138a9e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu May 24 09:43:11 2018 +0200

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

 nx-X11/programs/Xserver/hw/nxagent/Events.c     |  88 ++++----
 nx-X11/programs/Xserver/hw/nxagent/Events.h     |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Extensions.c |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c  |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Screen.c     | 269 ++++++++++++------------
 nx-X11/programs/Xserver/hw/nxagent/Screen.h     |   8 +-
 nx-X11/programs/Xserver/hw/nxagent/Window.c     |   7 +-
 7 files changed, 203 insertions(+), 175 deletions(-)

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