[xpra-codecs-freeworld/f27: 2/2] Merge branch 'master' into f27
commit 45822269ec9f894763246d42c930c403c8ec8118
Merge: 1fbbc69 007d554
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Feb 22 14:12:35 2018 +0100
Merge branch 'master' into f27
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld-ffmpeg35.patch | 16 ----------------
xpra-codecs-freeworld.spec | 6 +++++-
4 files changed, 7 insertions(+), 18 deletions(-)
---