[kdenlive: 5/6] Merge branch 'f25'
commit b4d5e69929c46b44bbaadb6602d507e83da5e311
Merge: 99312f1 01de0f9
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Feb 21 01:11:01 2017 +0000
Merge branch 'f25'
.gitignore | 1 +
kdenlive.spec | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
---
diff --cc .gitignore
index e2210b7,3c4b79e..de7b097
--- a/.gitignore
+++ b/.gitignore
@@@ -2,4 -2,4 +2,5 @@@
/kdenlive-16.08.0.tar.xz
/kdenlive-16.08.1.tar.xz
/kdenlive-16.08.2.tar.xz
+ /kdenlive-16.08.3.tar.xz
+/kdenlive-16.12.0.tar.xz
diff --cc kdenlive.spec
index 956da1c,c774a2a..fd8d0e1
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@@ -139,9 -139,12 +139,15 @@@ f
%changelog
+ * Tue Jan 31 2017 Sérgio Basto <sergio(a)serjux.com> - 16.08.3-2
+ - Requires mlt-freeworld on el7
+
+ * Tue Jan 31 2017 Sérgio Basto <sergio(a)serjux.com> - 16.08.3-1
+ - Update kdenlive to 16.08.3 like kde-baseapps
+
+* Fri Jan 06 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 16.12.0-1
+- Update to 16.12.0
+
* Thu Oct 13 2016 Sérgio Basto <sergio(a)serjux.com> - 16.08.2-1
- Update to 16.08.2
- Scriplets fixed by upstream