[X2Go-Commits] [nx-libs] 180/219: Merge branch 'uli42-pr/fix_background' 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 8b15d574b49857cdf4df0fd813d68b750d8aee5f
Merge: f24767b3c 3563959c0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Aug 27 08:14:23 2019 +0200

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

 nx-X11/programs/Xserver/dix/window.c             |   2 -
 nx-X11/programs/Xserver/hw/nxagent/Display.c     |  16 ---
 nx-X11/programs/Xserver/hw/nxagent/Events.c      |  15 ---
 nx-X11/programs/Xserver/hw/nxagent/Imakefile     |   1 -
 nx-X11/programs/Xserver/hw/nxagent/Init.c        |   3 +-
 nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c  |  36 ++----
 nx-X11/programs/Xserver/hw/nxagent/NXwindow.c    |  81 --------------
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c   |   2 +-
 nx-X11/programs/Xserver/hw/nxagent/Screen.c      |  11 +-
 nx-X11/programs/Xserver/hw/nxagent/Splash.c      | 135 +++++++++++++----------
 nx-X11/programs/Xserver/hw/nxagent/Splash.h      |  13 +--
 nx-X11/programs/Xserver/hw/nxagent/Window.c      |  50 ---------
 nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 |   6 +-
 nx-X11/programs/Xserver/os/utils.c               |   3 +
 14 files changed, 103 insertions(+), 271 deletions(-)

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