[X2Go-Commits] [live-build-x2go] 70/94: Merge commit 'b82648e357db470000243d0a79d15c229adaab5c' into feature/openbox-stretch

[git-admin at x2go.org]

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

x2go pushed a commit to branch feature/openbox-stretch
in repository live-build-x2go.

commit 2e6b7f65fd58ae69e4dcd67633dd16b26d777479
Merge: 079bb34 b82648e
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sat Jan 19 13:35:13 2019 +0000

    Merge commit 'b82648e357db470000243d0a79d15c229adaab5c' into feature/openbox-stretch

 .../etc/network/if-up.d/0050-settime               | 49 ++++++++++++++++
 .../etc/network/if-up.d/0100-show-sysconf          | 52 +++++++++++++++++
 .../network/if-up.d/0200-getsshpubkeysfromserver   | 48 +++++++++++++++
 .../etc/network/if-up.d/0300-getxorgconf           | 46 +++++++++++++++
 .../etc/network/if-up.d/0400-getsessions           | 49 ++++++++++++++++
 .../etc/network/if-up.d/0410-getbranding           | 46 +++++++++++++++
 .../includes.chroot/etc/network/if-up.d/0420-getbg | 46 +++++++++++++++
 .../etc/network/if-up.d/0430-getxroot              | 46 +++++++++++++++
 .../includes.chroot/lib/live/config/2000-settime   | 66 ---------------------
 .../lib/live/config/2100-show-sysconf              | 68 ----------------------
 .../lib/live/config/2250-getsshpubkeysfromserver   | 67 ---------------------
 .../lib/live/config/2300-xserver-xorg-getxorgconf  | 59 -------------------
 .../lib/live/config/2700-x2go-getsessions          | 62 --------------------
 .../lib/live/config/2710-x2go-getbranding          | 61 -------------------
 .../lib/live/config/2720-x2go-getbg                | 61 -------------------
 .../lib/live/config/2730-x2go-getxbackground       | 61 -------------------
 16 files changed, 382 insertions(+), 505 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git