[X2Go-Commits] [live-build-x2go] 06/11: Merge commit '4e99030fff96a2443736ca6e5ddb82faa8172c87' into feature/openbox-magic-pixel-workaround-stretch-bpokrnl

git-admin at x2go.org git-admin at x2go.org
Wed Mar 20 22:47:14 CET 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/openbox-magic-pixel-workaround-stretch-bpokrnl
in repository live-build-x2go.

commit 9c4201445f5a2cb1f2281f5a52b75197e0f482d5
Merge: 451322d 4e99030
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Fri Dec 14 23:15:07 2018 +0100

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

 .../lib/live/config/2260-getsshhostkeysfrommedia   |  22 ++--
 .../lib/live/config/2270-getsshclientkeysfrommedia |  47 ++++---
 .../live/config/2280-x2go-getportableappsessions   | 140 +++++++++++++++++----
 .../includes.chroot/lib/live/config/2600-tcpprint  |   8 +-
 .../lib/live/config/2900-x2go-thinclientconfig     |   3 +-
 config/package-lists/desktop.list.chroot           |   2 +-
 config/package-lists/x2go.list.chroot              |   4 +
 7 files changed, 168 insertions(+), 58 deletions(-)

diff --cc config/package-lists/x2go.list.chroot
index 8b91e0d,c1f1765..1fcb2cb
--- a/config/package-lists/x2go.list.chroot
+++ b/config/package-lists/x2go.list.chroot
@@@ -14,8 -14,10 +14,10 @@@ libfreerdp-plugins-standar
  libfreerdp-primitives1.1
  libfreerdp-rail1.1
  libfreerdp-utils1.1
+ libgstreamer0.10-0
+ libgstreamer-plugins-base0.10-0
  libjpeg62-turbo
 -libssl1.0.0
 +libssl1.0.2
  libwinpr-crt0.1
  libwinpr-crypto0.1
  libwinpr-dsparse0.1

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


More information about the x2go-commits mailing list