commit cb3156d75122e1487f11f199bc7dfa425a9957b5 Merge: 0a80a36 298d28e Author: Richard Shaw <hobbes1069(a)gmail.com&gt; Date: Wed Nov 22 06:32:12 2017 -0600 Merge branch 'master' into el7 .gitignore | 8 ++ openshot-1.4.0-doc-install.diff | 44 ------- openshot-1.4.0-use_mlt-melt.diff | 24 ---- openshot-find-lang.sh | 253 ++++++++++++++++++++++++++++++++++++++ openshot.png | Bin 3997 -> 0 bytes openshot.spec | 256 +++++++++++++++++++++------------------ sources | 2 +- 7 files changed, 401 insertions(+), 186 deletions(-) ---