[X2Go-Commits] [x2goserver] branch x2goserver-xsettings updated (d7f158f -> 867ba19)

git-admin at x2go.org git-admin at x2go.org
Mon Nov 24 03:34:07 CET 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch x2goserver-xsettings
in repository x2goserver.

      from  d7f158f   xsettings: use merge shell function to merge the determined base config with the overrides config.
       new  695dd9a   xsettings: remove .conf suffix from xsettingsd config files.
       new  58299e4   xsettings: add comment explaining the merge shell function and its requirements.
       new  706b527   xsettings: create XSETTINGSD_OVERRIDES_CONF if missing.
       new  ae85e6c   xsettings: rename xsettings.conf previously missed.
       new  867ba19   xsettings: documentation update, describe the newly implemented features.

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 x2goserver-xsettings/Makefile                      |    4 +--
 x2goserver-xsettings/README.md                     |    2 +-
 .../etc/{xsettings.conf => xsettings}              |    0
 .../post-start.d/900_xsettings-xsettingsd-startup  |   23 +++++++++---
 .../man/man8/x2goserver-xsettings.8.in             |   38 +++++++++++++++-----
 5 files changed, 52 insertions(+), 15 deletions(-)
 rename x2goserver-xsettings/etc/{xsettings.conf => xsettings} (100%)

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git


More information about the x2go-commits mailing list