s4504kr pushed to blender (f21). "New upstream release"

[notifications at fedoraproject.org]

>From 0c059179bf3a6872a76e047cf26f3f6aa8c31b87 Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Wed, 1 Apr 2015 13:17:45 +0200
Subject: New upstream release


diff --git a/.gitignore b/.gitignore
index c37cc61..f71171f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,9 @@ blender-2.49b-repack.tar.bz2
 /blender-2.72.tar.gz
 /blender-2.72b.tar.gz
 /blender-2.73.tar.gz
+<<<<<<< HEAD
 >>>>>>> 0d88b50... New upstream release
+=======
+/blender-2.73a.tar.gz
+/blender-2.74.tar.gz
+>>>>>>> ab7341e... New upstream release
diff --git a/blender.spec b/blender.spec
index d3b1138..309eefe 100644
--- a/blender.spec
+++ b/blender.spec
@@ -1,4 +1,4 @@
-%global blender_api 2.73
+%global blender_api 2.74
 %global blender_fontdir %{_fontbasedir}/blender
 
 # [Fedora] Turn off the brp-python-bytecompile script 
@@ -296,6 +296,24 @@ fi
 %doc release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
 
 %changelog
+* Wed Apr  1 2015 Jochen Schmitt <Jochen herr-schmitt de> - 1:2.74-1
+- New upstream release
+
+* Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 1:2.73a-5
+- Add an AppData file for the software center
+
+* Wed Feb 04 2015 Petr Machata <pmachata at redhat.com> - 1:2.73a-4
+- Bump for rebuild.
+
+* Wed Jan 28 2015 Richard Shaw <hobbes1069 at gmail.com> - 1:2.73a-3
+- Rebuild for OpenImageIO 1.5.10.
+
+* Wed Jan 28 2015 Petr Machata <pmachata at redhat.com> - 1:2.73a-2
+- Rebuild for boost 1.57.0
+
+* Wed Jan 21 2015 Jochen Schmitt <Jochen herr-schmitt de> - 1:2.73a-1
+- New minor bug-fixing release from upstream
+
 * Thu Jan  8 2015 Jochen Schmitt <Jochen herr-schmitt de> - 1:2.73-1
 - New upstream release
 
diff --git a/sources b/sources
index f21179a..045c07c 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 8e546e622c6dfc1f0231636270bdf8de  blender-2.73.tar.gz
+=======
+488151953d69d63bedd8ed59f92daf3b  blender-2.74.tar.gz
+>>>>>>> ab7341e... New upstream release
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/blender.git/commit/?h=f21&id=0c059179bf3a6872a76e047cf26f3f6aa8c31b87