This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch x2goserver-xsettings in repository x2goserver. commit 5ff6462ae317ecd6c2af25142c5bc5b2015a405d Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:21:38 2014 +0100 xsettings: add XSETTINGSD_OVERRIDES_CONF for the user-provided config overriding arbitrary settings and XSETTINGSD_CONF as the file eventually to be used by xsettingsd. --- .../post-start.d/900_xsettings-xsettingsd-startup | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index b3e79ac..a802e26 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -117,6 +117,8 @@ XSETTINGSD_PID="${X2GO_SESSION_DIR}/xsettingsd.pid" XSETTINGSD_LOG="${X2GO_SESSION_DIR}/xsettingsd.log" XSETTINGSD_REMOTE_CONF="${X2GO_SESSION_DIR}/xsettings-remote.conf" XSETTINGSD_DEFAULT_CONF="${X2GO_CONF_DIR}/xsettings.conf" +XSETTINGSD_OVERRIDES_CONF="${HOME}/.xsettings-x2go.conf" +XSETTINGSD_CONF="${X2GO_CONF_DIR}/xsettings.conf" export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9\-]//g")" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git