[X2Go-Commits] [nx-libs] 04/30: Merge branch 'sunweaver-pr/idletime-counter' into 3.6.x
git-admin at x2go.org
git-admin at x2go.org
Tue Jul 3 22:23:56 CEST 2018
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 9834951239bbbfb24dfc919b7e321e21e14d3222
Merge: 72f11ee 222153a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Jul 3 16:04:16 2018 +0200
Merge branch 'sunweaver-pr/idletime-counter' into 3.6.x
Attributes GH PR #713: https://github.com/ArcticaProject/nx-libs/pull/713
Reviewed by Ulrich Sibiller <uli42 at gmx.de> -- Tue, 3 Jul 2018 15:24:31 +0200 (CEST)
nx-X11/programs/Xserver/Xext/dpms.c | 17 +---
nx-X11/programs/Xserver/Xext/sync.c | 159 +++++++++++++++++++++++++++++++++++
nx-X11/programs/Xserver/dix/window.c | 2 -
3 files changed, 163 insertions(+), 15 deletions(-)
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list