[simplescreenrecorder/f26: 6/8] Merge branch 'master' into f26
commit 08e749eac38a5428ae0f3ada78074efe4da4cf72
Merge: 67a0f79 3d110d5
Author: Vasiliy Glazov <v.glazov(a)javad.com>
Date: Tue Mar 13 16:24:56 2018 +0300
Merge branch 'master' into f26
.gitignore | 1 +
ffmpeg35_buildfix.patch.patch | 61 +++++++++++++++++++++++++++++++++++++++++++
simplescreenrecorder.spec | 25 +++++++++++++++---
sources | 2 +-
4 files changed, 84 insertions(+), 5 deletions(-)
---