[X2Go-Commits] [live-build-x2go] 47/115: Merge branch 'feature/openbox' 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 3e76f9dc12cc63ca384f8ad0e64fe13c1c486231
Merge: 928d014 55a7b0c
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Wed May 2 00:41:25 2018 +0200

    Merge branch 'feature/openbox' into feature/openbox-magic-pixel-workaround-stretch
    
    Conflicts:
    	config/package-lists/desktop.list.chroot

 config/package-lists/desktop.list.chroot | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --cc config/package-lists/desktop.list.chroot
index 64a6427,819a298..bf4be8d
--- a/config/package-lists/desktop.list.chroot
+++ b/config/package-lists/desktop.list.chroot
@@@ -1,9 -1,6 +1,8 @@@
 +libevdev2 
 +libmtdev1 
  x11vnc 
  x11vnc-data 
- xserver-xorg-input-evdev
- xserver-xorg-input-wacom
+ xserver-xorg-input-all
  xserver-xorg-video-all
  # for i386 only #xserver-xorg-video-geode
  xserver-xorg-video-qxl

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