From 9a31200633ea720b8179bc3590832115ad86d3cf Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sep 07 2012 16:59:33 +0000
Subject: Merge branch 'master' into f17


Conflicts:
	.gitignore
	cantor.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index a927066..2e83590 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/cantor-4.8.3.tar.xz
-/cantor-4.8.4.tar.xz
 /cantor-4.8.5.tar.xz
+/cantor-4.9.1.tar.xz
diff --git a/cantor.spec b/cantor.spec
index 273431b..3630875 100644
--- a/cantor.spec
+++ b/cantor.spec
@@ -1,7 +1,6 @@
-
 Name:    cantor 
 Summary: KDE Frontend to Mathematical Software 
-Version: 4.8.5
+Version: 4.9.1
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -135,11 +134,26 @@ fi
 
 
 %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
+
+* Thu Jul 26 2012 Lukas Tinkl <ltinkl@redhat.com> - 4.9.0-1
+- 4.9.0
+
+* Wed Jul 18 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
+
+* Wed Jun 27 2012 Jaroslav Reznik <jreznik@redhat.com> - 4.8.95-1
+- 4.8.95
+
+* Sat Jun 09 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.90-1
+- 4.8.90
 
-* Mon Jun 04 2012 Than Ngo <than@redhat.com> - 4.8.4-1
-- 4.8.4
+* Fri Jun 01 2012 Jaroslav Reznik <jreznik@redhat.com> - 4.8.80-1
+- 4.8.80
 
 * Mon Apr 30 2012 Jaroslav Reznik <jreznik@redhat.com> - 4.8.3-1
 - 4.8.3
diff --git a/sources b/sources
index 77eb74f..7364b89 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a72d9436e9ed7863db72362fce7911ec  cantor-4.8.5.tar.xz
+413694f335d1ba877b910cdf0006332c  cantor-4.9.1.tar.xz