[X2Go-Commits] [live-build-x2go] 02/115: Merge branch 'feature/openbox-magic-pixel-workaround' into feature/openbox-magic-pixel-workaround-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-magic-pixel-workaround-stretch
in repository live-build-x2go.

commit 0c23594068fdb28ada28ac1cb7bfe0ea2f42fd53
Merge: 192b633 b56fe41
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Wed Jan 24 12:46:22 2018 +0100

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


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