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 4c1080913f0cde09bfaec767652e52b9929016ac Merge: b6ee127 55a7b0c Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed May 2 00:39:48 2018 +0200 Merge branch 'feature/openbox' into feature/mate-minidesktop-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 9ba727a,819a298..249033b --- 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