From e010f804d7dc0fca6161f5d319d9a7de4ada92d2 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Oct 12 2014 03:14:04 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/.gitignore b/.gitignore
index c15bfd8..2a1ac2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /knavalbattle-4.13.97.tar.xz
 /knavalbattle-4.14.0.tar.xz
 /knavalbattle-4.14.1.tar.xz
+/knavalbattle-4.14.2.tar.xz
diff --git a/knavalbattle.spec b/knavalbattle.spec
index 5a00911..63fb3ee 100644
--- a/knavalbattle.spec
+++ b/knavalbattle.spec
@@ -1,7 +1,7 @@
 
 Name:    knavalbattle
 Summary: A ship sinking game
-Version: 4.14.1
+Version: 4.14.2
 Release: 1%{?dist}
 
 License: GPLv2+ and GFDL
@@ -75,6 +75,9 @@ update-desktop-database -q &> /dev/null ||:
 
 
 %changelog
+* Sun Oct 12 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.14.2-1
+- 4.14.2
+
 * Tue Sep 16 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.14.1-1
 - 4.14.1
 
diff --git a/sources b/sources
index ba5940c..d8bd7d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c931df903be8582fd5fe3e2805f2152  knavalbattle-4.14.1.tar.xz
+900a0fa27a2a285bab1ab3d863ccd6e7  knavalbattle-4.14.2.tar.xz