Merge branch 'master' into f21

2014-10-11 08:25:30 -05:00 · 2014-10-11 08:25:30 -05:00 · 47aaf1fd69
parent b734e8a845 9baad4c7da
commit 47aaf1fd69
3 changed files with 6 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
 /kdelibs-4.13.97.tar.xz
 /kdelibs-4.14.0.tar.xz
 /kdelibs-4.14.1.tar.xz
+/kdelibs-4.14.2.tar.xz
--- a/kdelibs.spec
+++ b/kdelibs.spec
@ -38,7 +38,7 @@
 %global _changelog_trimtime %(date +%s -d "1 year ago")

 Summary: KDE Libraries
-Version: 4.14.1
+Version: 4.14.2
 Release: 1%{?dist}

 Name: kdelibs
@ -725,6 +725,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :


 %changelog
+* Sat Oct 11 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.2-1
+- 4.14.2
+
 * Mon Sep 15 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.1-1
 - 4.14.1

--- a/2
+++ b/2
@ -1 +1 @@
-678acc5880ba5da96ae66d383e19a52b  kdelibs-4.14.1.tar.xz
+a0f5dff706c03ff19b99bc2c51f8de2c  kdelibs-4.14.2.tar.xz