[obs-studio/f27: 5/5] Merge branch 'master' into f27
commit 9cd83be89d744c017f5d1e752c80c7f385f02dd6
Merge: 329dd27 c1934f4
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Wed Aug 22 02:02:51 2018 +0200
Merge branch 'master' into f27
obs-ffmpeg-mux.patch | 10 +++++-----
obs-studio.spec | 11 ++++++++++-
sources | 2 +-
3 files changed, 16 insertions(+), 7 deletions(-)
---