[X2Go-Commits] [nx-libs] 162/219: Merge branch 'uli42-pr/improve_wait_events' 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 f24767b3ccfa3f659846f78f32dd13e49dfb1752
Merge: 7f4b50deb 62573abf0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Aug 16 11:52:35 2019 +0200

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

 nx-X11/programs/Xserver/hw/nxagent/Client.c   |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Events.c   | 43 ++++++++++++++-------------
 nx-X11/programs/Xserver/hw/nxagent/Events.h   |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Handlers.c |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Screen.c   |  6 +---
 nx-X11/programs/Xserver/hw/nxagent/Split.c    |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Window.c   |  6 +---
 nxcomp/src/Loop.cpp                           |  4 +++
 8 files changed, 32 insertions(+), 35 deletions(-)

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