From 7b5e801bbc4f844843c58e9a1c4ef7a2d0d57203 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Mar 04 2013 19:14:28 +0000
Subject: Merge branch 'master' into f18


Conflicts:
	kdegraphics.spec

---

diff --git a/kdegraphics.spec b/kdegraphics.spec
index 77a6706..4191d1d 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -1,7 +1,7 @@
 Name:    kdegraphics
 Summary: KDE Graphics Applications
 Epoch:   7
-Version: 4.9.5
+Version: 4.10.1
 Release: 1%{?dist}
 
 Group:   Applications/Multimedia
@@ -85,11 +85,23 @@ Requires: okular-devel
 
 
 %changelog
-* Sat Dec 29 2012 Rex Dieter <rdieter@fedoraproject.org> - 7:4.9.5-1
-- 4.9.5
+* Sat Mar 02 2013 Rex Dieter <rdieter@fedoraproject.org> - 7:4.10.1-1
+- 4.10.1
 
-* Wed Dec 05 2012 Than Ngo <than@redhat.com> - 7:4.9.4-1
-- 4.9.4
+* Fri Feb 01 2013 Rex Dieter <rdieter@fedoraproject.org> - 7:4.10.0-1
+- 4.10.0
+
+* Tue Jan 22 2013 Rex Dieter <rdieter@fedoraproject.org> - 7:4.9.98-1
+- 4.9.98
+
+* Fri Jan 04 2013 Rex Dieter <rdieter@fedoraproject.org> - 7:4.9.97-1
+- 4.9.97
+
+* Thu Dec 20 2012 Rex Dieter <rdieter@fedoraproject.org> - 7:4.9.95-1
+- 4.9.95
+
+* Tue Dec 04 2012 Rex Dieter <rdieter@fedoraproject.org> - 7:4.9.90-1
+- 4.9.90
 
 * Sat Nov 03 2012 Rex Dieter <rdieter@fedoraproject.org> - 7:4.9.3-1
 - 4.9.3