[X2Go-Commits] [nx-libs] 46/429: Merge branch 'uli42-pr/window_resize_bug' 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 13211ec6a5060db75c93cbb4e75d017b0a49386e
Merge: 7a02b4aba 2d99cdd1c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Oct 18 12:30:54 2020 +0200

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

 nx-X11/programs/Xserver/hw/nxagent/Display.c    |  70 +++--
 nx-X11/programs/Xserver/hw/nxagent/Display.h    |   2 +
 nx-X11/programs/Xserver/hw/nxagent/Events.c     | 143 ++++++---
 nx-X11/programs/Xserver/hw/nxagent/Extensions.c |   4 +-
 nx-X11/programs/Xserver/hw/nxagent/Init.c       |   6 +-
 nx-X11/programs/Xserver/hw/nxagent/NXwindow.c   |  11 +-
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c  |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Screen.c     | 372 +++++++++++++-----------
 nx-X11/programs/Xserver/hw/nxagent/Screen.h     |   4 +-
 nx-X11/programs/Xserver/hw/nxagent/Window.c     |  69 ++++-
 10 files changed, 416 insertions(+), 267 deletions(-)

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