[libxmp/f20] update to 4.3.4

[Dominik Mierzejewski]

commit 418a595281205336109e57e7b015a48c2209f04a
Author: Dominik 'Rathann' Mierzejewski <dominik at greysector.net>
Date:   Tue Jan 13 13:36:23 2015 +0100

    update to 4.3.4
    
    http://sourceforge.net/projects/xmp/files/libxmp/4.3.4/Changelog/view
    
    Conflicts:
    	.gitignore
    	libxmp.spec
    	sources

 .gitignore  |    1 +
 libxmp.spec |    5 ++++-
 sources     |    4 ++++
 3 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 79435e3..f61343f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /libxmp-4.2.5.tar.gz
 /libxmp-4.2.7.tar.gz
 /libxmp-4.3.0.tar.gz
+/libxmp-4.3.4.tar.gz
diff --git a/libxmp.spec b/libxmp.spec
index dc7b765..eb43c42 100644
--- a/libxmp.spec
+++ b/libxmp.spec
@@ -1,5 +1,5 @@
 Name: libxmp
-Version: 4.3.0
+Version: 4.3.4
 Release: 1%{?dist}
 Summary: A multi-format module playback library
 Source0: http://downloads.sourceforge.net/project/xmp/libxmp/%{version}/libxmp-%{version}.tar.gz
@@ -63,6 +63,9 @@ make check %{?_smp_mflags}
 %{_libdir}/libxmp.so
 
 %changelog
+* Tue Jan 13 2015 Dominik Mierzejewski <rpm at greysector.net> - 4.3.4-1
+- update to 4.3.4 (http://sourceforge.net/projects/xmp/files/libxmp/4.3.4/Changelog/view)
+
 * Thu Oct 09 2014 Dominik Mierzejewski <rpm at greysector.net> - 4.3.0-1
 - update to 4.3.0 (http://sourceforge.net/projects/xmp/files/libxmp/4.3.0/Changelog/view)
 
diff --git a/sources b/sources
index be8fc07..db0f9ec 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 46cdfa9fd5fb8e22ea8dacd750cb5c01  libxmp-4.3.0.tar.gz
+=======
+2c5c2fb93072c3f3b3f3cafb121efdea  libxmp-4.3.4.tar.gz
+>>>>>>> c4cf627... update to 4.3.4