From 1bdd70aa12c9ad3f1a63e6c5431b73d652595f87 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Feb 02 2014 22:31:47 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/.gitignore b/.gitignore
index 5fa4c1e..d150a2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,9 @@
 /libkdegames-4.11.1.tar.xz
 /libkdegames-4.11.2.tar.xz
 /libkdegames-4.11.3.tar.xz
+/libkdegames-4.11.90.tar.xz
+/libkdegames-4.11.95.tar.xz
+/libkdegames-4.11.97.tar.xz
+/libkdegames-4.12.0.tar.xz
+/libkdegames-4.12.1.tar.xz
+/libkdegames-4.12.2.tar.xz
diff --git a/libkdegames.spec b/libkdegames.spec
index a65886e..6ed6fb3 100644
--- a/libkdegames.spec
+++ b/libkdegames.spec
@@ -1,7 +1,7 @@
 
 Name:    libkdegames
 Summary: Common code and data for many KDE games
-Version: 4.11.3
+Version: 4.12.2
 Release: 1%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
@@ -81,6 +81,24 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Fri Jan 31 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.2-1
+- 4.12.2
+
+* Fri Jan 10 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.1-1
+- 4.12.1
+
+* Thu Dec 19 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.12.0-1
+- 4.12.0
+
+* Sun Dec 01 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.97-1
+- 4.11.97
+
+* Thu Nov 21 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.95-1
+- 4.11.95
+
+* Fri Nov 15 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.90-1
+- 4.11.90
+
 * Fri Nov 01 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.3-1
 - 4.11.3
 
diff --git a/sources b/sources
index fac23d0..b46c0ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-056c272721a8742a622951739e649b03  libkdegames-4.11.3.tar.xz
+75589c08d4ada3e8739928c48d1b0388  libkdegames-4.12.2.tar.xz