[vdr-xineliboutput/f24: 5/5] Merge branch 'master' into f24
commit a44f9c2f1722252b50d8d407a7e6a8b43c887b8e
Merge: d1c30e6 0d3453d
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Jan 28 13:13:43 2017 +0100
Merge branch 'master' into f24
.gitignore | 2 -
sources | 1 -
vdr-xineliboutput-1.1.0-29f7afd.tar.gz | Bin 0 -> 412846 bytes
vdr-xineliboutput.spec | 261 ---------------------------------
4 files changed, 264 deletions(-)
---
diff --cc vdr-xineliboutput-1.1.0-29f7afd.tar.gz
index 0000000,0000000..1260395
new file mode 100644
Binary files differ