[ogre: 4/4] Merge branch 'master' of ssh://pkgs.fedoraproject.org/ogre

[Bruno Wolff III]

commit 05be0cb01fbed18b550e1ce49c6cacf6597d8847
Merge: 66c5cfb 105e454
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sat May 14 15:23:27 2011 -0500

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

 ogre.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc ogre.spec
index 050ba9d,b3867f2..8114115
--- a/ogre.spec
+++ b/ogre.spec
@@@ -202,10 -202,9 +202,13 @@@ ln -s ../../../../fonts/dejavu/DejaVuSa
  
  
  %changelog
 +* Sat May 14 2011 Bruno Wolff III <bruno at wolff.to> - 1.7.3-1
 +- Upstream update to 1.7.3
 +- Changelog at http://www.ogre3d.org/2011/05/08/ogre-1-7-3-cthugha-released#more-1284
 +
+ * Mon Apr 04 2011 Jon Ciesla <limb at jcomserv.net> - 1.7.2-14
+ - Re-rebuilding for boost 1.46.1, 2011-03-15 rebuild got 1.46.0.
+ 
  * Tue Mar 15 2011 Bruno Wolff III <bruno at wolff.to> - 1.7.2-13
  - Rebuild for boost 1.46.1 update