[obs-studio/f25: 3/3] Merge branch 'master' into f25
commit 4e5886b02ae054563cb33a0e4d3f1beb536a0f76
Merge: 4842429 26123a8
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Oct 1 18:38:45 2016 +0200
Merge branch 'master' into f25
.gitignore | 1 +
obs-studio.spec | 27 ++++++++++++++++++++++++---
sources | 2 +-
3 files changed, 26 insertions(+), 4 deletions(-)
---