[X2Go-Commits] [nx-libs] 20/30: Merge branch 'uli42-pr/update_os' 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 7a4aa75de1930b88b923b878e222eb8588e33cdf
Merge: 78724c4 41ff6b0
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Feb 27 03:20:46 2018 +0100

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

 nx-X11/programs/Xserver/os/WaitFor.c |  1 +
 nx-X11/programs/Xserver/os/osdep.h   |  2 ++
 nx-X11/programs/Xserver/os/utils.c   |  3 ---
 nx-X11/programs/Xserver/os/xdmauth.c | 10 ++++------
 4 files changed, 7 insertions(+), 9 deletions(-)

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