From 84b362357706e6158e54024e87b6af8576862f7c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sep 10 2012 12:41:46 +0000
Subject: Merge branch 'master' into f17


Conflicts:
	.gitignore
	kmag.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index 6bb510c..ecc3896 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
-/kmag-4.8.1.tar.xz
-/kmag-4.8.2.tar.xz
-/kmag-4.8.3.tar.xz
-/kmag-4.8.4.tar.xz
 /kmag-4.8.5.tar.xz
+/kmag-4.9.1.tar.xz
diff --git a/kmag.spec b/kmag.spec
index b877971..b888dac 100644
--- a/kmag.spec
+++ b/kmag.spec
@@ -1,5 +1,5 @@
 Name:    kmag
-Version: 4.8.5
+Version: 4.9.1
 Release: 1%{?dist}
 Summary: A screen magnifier
 
@@ -73,11 +73,26 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 
 %changelog
-* Thu Aug 02 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.5-1
-- 4.8.5
+* Mon Sep 03 2012 Than Ngo <than@redhat.com> - 4.9.1-1
+- 4.9.1
 
-* Tue Jun 05 2012 Than Ngo <than@redhat.com> - 4.8.4-1
-- 4.8.4
+* Thu Jul 26 2012 Lukas Tinkl <ltinkl@redhat.com> - 4.9.0-1
+- 4.9.0
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.8.97-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jul 12 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.97-1
+- 4.8.97
+
+* Thu Jun 28 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.95-1
+- 4.8.95
+
+* Sun Jun 10 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.90-1
+- 4.8.90
+
+* Sun Jun 03 2012 Jaroslav Reznik <jreznik@redhat.com> - 4.8.80-1
+- 4.8.80
 
 * Tue May 01 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.3-1
 - 4.8.3
diff --git a/sources b/sources
index bdb8013..ff0bafb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f70d06b626ceb14ed74368e74e420dd  kmag-4.8.5.tar.xz
+688368dbf052388677c302bc182b29eb  kmag-4.9.1.tar.xz