[X2Go-Commits] [live-build-x2go] 161/166: Merge changes to config/includes.chroot/lib/live/config/ from feature/openbox into feature/mate-minidesktop.

[git-admin at x2go.org]

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

x2go pushed a commit to branch feature/mate-minidesktop
in repository live-build-x2go.

commit 30a97c520ad756845740df2af4cdbe36a48ab3f4
Merge: 3020af6 534bd12
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Wed Aug 2 16:01:04 2017 +0200

    Merge changes to config/includes.chroot/lib/live/config/ from feature/openbox into feature/mate-minidesktop.

 .../includes.chroot/lib/live/config/2000-settime   |  48 ++
 .../lib/live/config/2100-show-sysconf              |  71 +-
 .../lib/live/config/2250-getsshpubkeysfromserver   |  63 +-
 .../lib/live/config/2300-xserver-xorg-getxorgconf  |  60 +-
 .../lib/live/config/2400-live-autoupdate           | 851 ++++++++++++---------
 .../includes.chroot/lib/live/config/2600-tcpprint  |  18 +-
 .../lib/live/config/2700-x2go-getsessions          |  60 +-
 7 files changed, 716 insertions(+), 455 deletions(-)

--
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