[vdr-xineliboutput/f24: 3/3] Merge branch 'master' into f24
commit 9f93d595a97a363a1e62a808bf21aa334b00358c
Merge: 7f17fb1 77cc284
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Apr 8 17:38:32 2017 +0200
Merge branch 'master' into f24
.gitignore | 1 +
sources | 2 +-
vdr-xineliboutput.spec | 15 +++++++++++----
3 files changed, 13 insertions(+), 5 deletions(-)
---