[obs-studio/f25: 2/2] Merge branch 'master' into f25
commit 0b73d991b6809b0bb809c1314ec6117602447202
Merge: 97d9726 5803290
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Mar 3 21:37:06 2017 +0000
Merge branch 'master' into f25
.gitignore | 10 +---------
obs-ffmpeg-mux.patch | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+), 9 deletions(-)
---