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

[Tom Callaway]

commit 0b768dd6874c72d99befc798b0e3ee22ba127f40
Merge: a732ef7 2c048d6
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Tue Mar 22 13:30:51 2011 -0400

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

 irrlicht.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc irrlicht.spec
index ca8dd82,169c8f6..e06812a
--- a/irrlicht.spec
+++ b/irrlicht.spec
@@@ -3,7 -3,7 +3,7 @@@
  Name:		irrlicht
  Summary: 	A high performance realtime 3D engine
  Version:	1.7.2
--Release:	5%{?dist}
++Release:	6%{?dist}
  License:	zlib
  Group:		System Environment/Libraries
  Source0:	http://downloads.sourceforge.net/irrlicht/%{name}-%{version}.zip
@@@ -140,11 -138,9 +140,14 @@@ rm -rf %{buildroot
  %{_libdir}/libIrrXML*.so
  
  %changelog
- * Tue Mar 22 2011 Tom Callaway <spot at fedoraproject.org> - 1.7.2-5
++* Tue Mar 22 2011 Tom Callaway <spot at fedoraproject.org> - 1.7.2-6
 +- rework shared library patch to ignore crufty ld flags
 +- rework fast_atof patch to use new naming, more portable typing
 +- do not package unnecessary patch history files
 +
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.2-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Wed Dec 15 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.2-4
  - add post/postun scripts for irrXML