This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 7559adb043e7b21170c05f8fb19769002fe1f98a Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jul 12 18:09:08 2016 +0200 Startup display message changed --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 7129485..96efbd0 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -6,6 +6,7 @@ X2GoThinClientConfig () # Output startup message # <<<<<<< HEAD +<<<<<<< HEAD echo -n " x2go-thinclientconfig" # using xmlstarlet would mean wasting yet another Megabyte of space ... @@ -16,6 +17,9 @@ sed -i -e '\#<action name="ShowMenu"><menu>[a-z-]*-menu</menu></action>#d' /etc/ # make sure OpenBox maximizes X2GoClient on launch and hides window decorations ======= echo -n " x2gothinclientconfig" +======= +echo -n " x2go-thinclientconfig" +>>>>>>> fa6f730... Startup display message changed
> dd779e0... typofix, and different invocation of pulseaudio sed -i -e '\#<applications>#a<application title="X2Go Client" type="normal">' -e '\#<applications>#a<decor>no</decor>' -e '\#<applications>#a</application>' /etc/xdg/openbox/rc.xml
-- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git