[X2Go-Commits] [nx-libs] 47/51: Merge branch 'uli42-pr/window_fixes' 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 ca8236e7fe565e851362a744bfa0312274e1f856
Merge: 4214a71 d16a5fb
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jan 17 12:06:34 2019 +0100

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

 nx-X11/programs/Xserver/hw/nxagent/Display.c    |   4 +-
 nx-X11/programs/Xserver/hw/nxagent/Extensions.c |  81 ++++++--------
 nx-X11/programs/Xserver/hw/nxagent/Screen.c     | 141 ++++++++++++------------
 nx-X11/programs/Xserver/hw/nxagent/Window.c     |  36 +++---
 4 files changed, 129 insertions(+), 133 deletions(-)

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