[flam3: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/flam3

[Ian Weller]

commit 52fb1e063376a61b9b7d90a4cae13bb8179bd077
Merge: 753df67 8fccd0c
Author: Ian Weller <ian at ianweller.org>
Date:   Thu Jan 26 15:29:00 2012 -0600

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/flam3
    
    Conflicts:
    	flam3.spec

 flam3.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc flam3.spec
index 3cbc01c,dda756c..1a57f3d
--- a/flam3.spec
+++ b/flam3.spec
@@@ -82,9 -84,9 +82,12 @@@ rm -rf %{buildroot
  
  
  %changelog
 +* Thu Jan 26 2012 Ian Weller <iweller at redhat.com> - 3.0.1-1
 +- Update to 3.0.1, hopefully it fixes libpng issues
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0-5.20101118svn35
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 3.0-4.20101118svn35
  - Rebuild for new libpng