From ef736ead8bfa2cb1a52649225f630e927d42b79a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sep 17 2014 01:26:20 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/.gitignore b/.gitignore
index 6a06576..4ce9e49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,6 @@
 /kollision-4.13.1.tar.xz
 /kollision-4.13.2.tar.xz
 /kollision-4.13.3.tar.xz
+/kollision-4.13.97.tar.xz
+/kollision-4.14.0.tar.xz
+/kollision-4.14.1.tar.xz
diff --git a/kollision.spec b/kollision.spec
index 12ca53a..8e552c3 100644
--- a/kollision.spec
+++ b/kollision.spec
@@ -1,7 +1,7 @@
 
 Name:    kollision
 Summary: A simple ball dodging game
-Version: 4.13.3
+Version: 4.14.1
 Release: 1%{?dist}
 
 License: GPLv2+ and GFDL
@@ -74,6 +74,18 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %changelog
+* Tue Sep 16 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.14.1-1
+- 4.14.1
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.14.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Fri Aug 15 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.14.0-1
+- 4.14.0
+
+* Tue Aug 05 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.13.97-1
+- 4.13.97
+
 * Tue Jul 15 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.13.3-1
 - 4.13.3
 
diff --git a/sources b/sources
index 2583831..ab4928a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7dced597bfb138eecb88127bc17d44fa  kollision-4.13.3.tar.xz
+9e574705921657c8bce133fe6cbf4866  kollision-4.14.1.tar.xz