[X2Go-Commits] [live-build-x2go] 82/186: Merge commit '8c5f78d8ff045adb7938cc52cdec5c73c448818e' 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-stretch
in repository live-build-x2go.

commit 02b2f8669132b524e466a3380e056557fc79dc7c
Merge: 1f6994b 8c5f78d
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sun Jan 6 00:51:35 2019 +0000

    Merge commit '8c5f78d8ff045adb7938cc52cdec5c73c448818e' into feature/mate-minidesktop
    
    Conflicts:
    	config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig

 .../etc/X11/Xsession.d/60x11-blanking-dpms-config  |  31 +++++++
 .../etc/X11/Xsession.d/60x11-configure-xinerama    |  58 ++++++++++++
 .../etc/X11/Xsession.d/60x11-openbox-start         |   4 +
 .../etc/X11/Xsession.d/60x11-set-background        |  43 +++++++++
 .../Xsession.d/60x11-spawn-configure-pulseaudio    |  32 +++++++
 .../etc/X11/Xsession.d/61x11-start-x2goclient      | 103 +++++++++++++++++++++
 .../initramfs-tools/hooks/0000-initrdblankdpmsfix  |  26 ++++++
 config/package-lists/xbackground.list.chroot       |   1 +
 8 files changed, 298 insertions(+)

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