[obs-studio/f27: 2/2] Merge branch 'master' into f27
commit 329dd27ef8ff98bd6cc5767126bd47c99c91c5b3
Merge: 2686e5b 4caa2b0
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed May 16 10:21:27 2018 +0100
Merge branch 'master' into f27
obs-studio.spec | 14 ++++++++++----
sources | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
---