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 ae589ab81513c659200672fa7e30e47100612f31 Merge: f6e19be 0202789 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Sun Nov 19 21:30:10 2017 +0100 Merge branch 'feature/openbox' into feature/mate-minidesktop Conflicts: config/package-lists/x2go.list.chroot .../lib/live/config/2100-show-sysconf | 8 +- .../lib/live/config/2250-getsshpubkeysfromserver | 14 +- .../lib/live/config/2260-getsshhostkeysfrommedia | 119 +++++++++++ .../lib/live/config/2270-getsshclientkeysfrommedia | 118 ++++++++++ .../lib/live/config/2300-xserver-xorg-getxorgconf | 14 +- .../lib/live/config/2400-live-autoupdate | 38 ++-- .../config/2510-x2go-getopensshportableclientkey | 46 ---- .../includes.chroot/lib/live/config/2600-tcpprint | 6 +- .../lib/live/config/2700-x2go-getsessions | 14 +- .../lib/live/config/2710-x2go-getbranding | 61 ++++++ .../lib/live/config/2720-x2go-getbg | 61 ++++++ .../lib/live/config/2900-x2go-thinclientconfig | 237 +++++++++++++++++++++ config/package-lists/live.list.chroot | 1 + config/package-lists/utils.list.chroot | 3 + config/package-lists/x2go.list.chroot | 14 +- config/rootfs/excludes | 4 + 16 files changed, 663 insertions(+), 95 deletions(-) diff --cc config/package-lists/x2go.list.chroot index 8e0fdff,06e85dc..3e92872 --- a/config/package-lists/x2go.list.chroot +++ b/config/package-lists/x2go.list.chroot @@@ -1,8 -1,6 +1,9 @@@ cryptsetup +firefox-esr +firefox-esr-l10n-de +flashplugin-nonfree freerdp-x11 + iso-codes libfile-path-expand-perl libfreerdp-cache1.1 libfreerdp-client1.1 @@@ -53,4 -52,10 +55,12 @@@ pulseaudio-module-x1 pulseaudio-utils rdesktop udev + x2goclient ++x2gothinclient-minidesktop ++x2gothinclient-usbmount + x2gousbmount + xfonts-75dpi + xfonts-scalable + xnest + xserver-xephyr zlib1g -- 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