commit f3b3eb52aeaaec0aec8f7a6fe4a0ad7077009dfa Merge: ab9a5d6 5867570 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Sun Mar 12 07:46:03 2017 +0000 Merge branch 'master' into el7 .gitignore | 1 - dead.package | 1 + kmediafactory-0.8.0-dso.patch | 12 -- kmediafactory-0.8.0-mlt-melt.patch | 26 --- kmediafactory-0.8.1-FindFFmpeg.patch | 55 ------ kmediafactory-0.8.1-desktop_validate.patch | 9 - kmediafactory-0.8.1-ffmpeg.patch | 37 ---- kmediafactory-0.8.1-gcc47.patch | 33 ---- kmediafactory.spec | 279 ----------------------------- sources | 1 - 10 files changed, 1 insertion(+), 453 deletions(-) ---