commit 6ccc940928b8c3b47b5f1d3985e05ec2146d6b8a Merge: 93894f9 007d554 Author: sagitter <sagitter(a)fedoraproject.org&gt; Date: Thu Feb 22 14:13:02 2018 +0100 Merge branch 'master' into f26 .gitignore | 1 + sources | 2 +- xpra-codecs-freeworld-ffmpeg35.patch | 16 ---------------- xpra-codecs-freeworld.spec | 6 +++++- 4 files changed, 7 insertions(+), 18 deletions(-) ---