[vdr-skindesigner/f24: 7/7] Update to 1.2.2
commit d469188e8e5e012cde1cceb98ebfcfda2953d844
Merge: 63a85cb e076939
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Sep 24 19:09:34 2016 +0200
Update to 1.2.2
.gitignore | 1 +
sources | 1 +
vdr-skindesigner.spec | 10 ++++++++++
3 files changed, 12 insertions(+)
---
diff --cc sources
index 24963a4,6945c88..7e7fffc
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
+c9974fc19932d0988fbba8cb845db9ac vdr-plugin-skindesigner-1.2.1.tar.bz2
+ 5240844fc0424663989c90f8ea5a2c1b vdr-plugin-skindesigner-1.2.2.tar.bz2
diff --cc vdr-skindesigner.spec
index dcf3b0d,f5156ba..50ec89a
--- a/vdr-skindesigner.spec
+++ b/vdr-skindesigner.spec
@@@ -1,5 -1,5 +1,9 @@@
Name: vdr-skindesigner
++<<<<<<< HEAD
+Version: 1.2.1
++=======
+ Version: 1.2.2
++>>>>>>> master
Release: 1%{?dist}
Summary: A VDR skinning engine that displays XML based Skins
@@@ -116,6 -116,9 +120,12 @@@ ldconfig -n %{buildroot}%{_libdir
%{_includedir}/libskindesignerapi/*
%changelog
++<<<<<<< HEAD
++=======
+ * Sat Sep 24 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 1.2.2-1
+ - Update to 1.2.2
+
++>>>>>>> master
* Sun Jul 31 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 1.2.1-1
- Update to 1.2.1