From 09586530f170c8b839b3c61f96439b98ba9bacdc Mon Sep 17 00:00:00 2001
From: Manuel F Martinez <manpaz@bashlinux.com>
Date: Dec 11 2010 06:11:41 +0000
Subject: Merge remote branch 'origin/f13/master'


Conflicts:
	audacity.spec

---

diff --git a/audacity.spec b/audacity.spec
index 23e11ac..1e14d3c 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -4,7 +4,11 @@
 Name: audacity
 
 Version: 1.3.12
+<<<<<<< HEAD
 Release: 0.6.beta%{?dist}
+=======
+Release: 0.4.beta%{?dist}
+>>>>>>> origin/f13/master
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -155,12 +159,15 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+<<<<<<< HEAD
 * Tue Dec  7 2010 Manuel F Martinez <manpaz@bashlinux.com> - 1.3.12-0.6.beta
 - Create gcc45 patch to fix issues with configure in portmixer
 
 * Wed Jul 14 2010 Dan Horák <dan@danny.cz> - 1.3.12-0.5.beta
 - rebuilt against wxGTK-2.8.11-2
 
+=======
+>>>>>>> origin/f13/master
 * Mon Jun 28 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.4.beta
 - mods to ease diffs between builds for fedora and full
 
@@ -169,8 +176,11 @@ update-desktop-database &> /dev/null || :
 
 * Mon Jun 28 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.2.beta
 - mod tartopdir to use package version macro
+<<<<<<< HEAD
 
 * Mon Jun 28 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.1.beta
+=======
+>>>>>>> origin/f13/master
 - upgrade to 1.3.12-beta
 - package new icons found in icons/hicolor