From 8b44bb19b67ee981b4c0088b0f50457f7dee61ea Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Aug 20 2010 13:01:51 +0000
Subject: Merge changes from F13 to ensure devel branch has bigger NVR.


Merge remote branch 'origin/f13/master'

Conflicts:
	audex.spec
	sources

Signed-off-by: Adam Tkac <atkac@redhat.com>

---

diff --git a/audex.spec b/audex.spec
index 55d2ea1..0dba5c7 100644
--- a/audex.spec
+++ b/audex.spec
@@ -1,6 +1,6 @@
 Name:           audex
 Version:        0.72
-Release:        0.5.beta1%{?dist}
+Release:        0.7.beta1%{?dist}
 Summary:        Audio ripper
 Group:          Applications/Multimedia
 License:        GPLv3+
@@ -70,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_datadir}/kde4/apps/audex
 
 %changelog
-* Tue Mar 03 2010 Roland Wolters <wolters.liste@gmx.net> 0.72-0.5.beta1
+* Tue Mar 03 2010 Roland Wolters <wolters.liste@gmx.net> 0.72-0.7.beta1
 - Fix compile bug
 
 * Mon Sep 28 2009 Roland Wolters <wolters.liste@gmx.net> 0.72-0.1.beta1
diff --git a/sources b/sources
index 123d676..e389f3a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 1953587ebc8e08f5de1eb782ecf92788  audex-0.72b1.tar.bz2
-8704301ce0325bbad304d2c3980920f8  KDE_4_4_compile_fix.patch
 462c4cdbbd915f53c87cd8489478d83b  dso-linking.patch
+8704301ce0325bbad304d2c3980920f8  KDE_4_4_compile_fix.patch