From 80240d663727ec5f07977945342636615d8ee82a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Mar 04 2013 16:56:05 +0000
Subject: Merge branch 'master' into f18


Conflicts:
	.gitignore
	kgeography.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index 13958eb..9c4c695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1 @@
-/kgeography-4.8.5.tar.xz
-/kgeography-4.9.1.tar.xz
-/kgeography-4.9.2.tar.xz
-/kgeography-4.9.3.tar.xz
-/kgeography-4.9.4.tar.xz
-/kgeography-4.9.5.tar.xz
+/kgeography-4.10.1.tar.xz
diff --git a/kgeography.spec b/kgeography.spec
index 829916c..b637141 100644
--- a/kgeography.spec
+++ b/kgeography.spec
@@ -1,6 +1,6 @@
 Name:    kgeography
 Summary: Geography Trainer 
-Version: 4.9.5
+Version: 4.10.1
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -71,8 +71,23 @@ fi
 
 
 %changelog
-* Sat Dec 29 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.9.5-1
-- 4.9.5
+* Sat Mar 02 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.10.1-1
+- 4.10.1
+
+* Fri Feb 01 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.10.0-1
+- 4.10.0
+
+* Tue Jan 22 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.9.98-1
+- 4.9.98
+
+* Fri Jan 04 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.9.97-1
+- 4.9.97
+
+* Thu Dec 20 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.9.95-1
+- 4.9.95
+
+* Tue Dec 04 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.9.90-1
+- 4.9.90
 
 * Mon Dec 03 2012 Than Ngo <than@redhat.com> - 4.9.4-1
 - 4.9.4
diff --git a/sources b/sources
index fff22be..560ea7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24509d58ebd022d854dbe2ca2ad6adc3  kgeography-4.9.5.tar.xz
+1babc1b8916854cfeb0a179a002f8111  kgeography-4.10.1.tar.xz