[X2Go-Commits] [live-build-x2go] 48/95: Merge commit 'c48fca4d81e88e3727b8c1079e08599c3f6889a5' into feature/openbox-magic-pixel-workaround

[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-magic-pixel-workaround
in repository live-build-x2go.

commit 77b19820e1e69cd3d0edde79232246e725ae6050
Merge: 1c8a31e c48fca4
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Wed Jan 2 22:42:45 2019 +0100

    Merge commit 'c48fca4d81e88e3727b8c1079e08599c3f6889a5' into feature/openbox-magic-pixel-workaround
    
    Conflicts:
    	config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig

 .../etc/X11/Xsession.d/60x11-configure-xinerama    |  58 ++++++
 .../etc/X11/Xsession.d/61x11-start-x2goclient      | 103 ++++++++++
 .../lib/live/config/2900-x2go-thinclientconfig     | 217 ---------------------
 3 files changed, 161 insertions(+), 217 deletions(-)

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