This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-magic-pixel-workaround in repository live-build-x2go. commit b56fe41d0fb437b3257794fea86a089e43d0368d Merge: 56684be fa886d5 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Jan 24 12:27:10 2018 +0100 Merge branch 'feature/openbox' into feature/openbox-magic-pixel-workaround Conflicts: config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig config/includes.chroot/lib/live/config/2000-settime | 18 +++++++++++++++++- .../lib/live/config/2900-x2go-thinclientconfig | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --cc config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index 9711f09,d5adaf7..bb8dfd9 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@@ -269,7 -232,7 +269,8 @@@ if [ -n "\$BLANKINGTIME" ]; the fi fi +eval \$THROTTLINGCOMMAND x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM \$BACKGROUND \$BRANDING \$STARTSESSION $DEBUGPARAMS # yes, no escape sign in front of DEBUGPARAMS, that is intentional + eval \$THROTTLINGCOMMAND x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM \$BACKGROUND \$BRANDING \$STARTSESSION XSESSION chown user:user /home/user/.xsession -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git