[openvrml: 2/2] Merged changes.

[Braden McDaniel]

commit 0ab794c688aec1720b20a0d81ff292d41cafd344
Merge: cff0929 cc0868d
Author: Braden McDaniel <braden at endoframe.com>
Date:   Tue Sep 14 11:03:39 2010 -0400

    Merged changes.

 openvrml.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc openvrml.spec
index 5982dac,2874279..2e1ed4f
--- a/openvrml.spec
+++ b/openvrml.spec
@@@ -1,7 -1,7 +1,7 @@@
  # -*- rpm-spec -*-
  Name:           openvrml
  Version:        0.18.6
--Release:        5%{?dist}
++Release:        6%{?dist}
  Summary:        VRML/X3D player and runtime library
  License:        LGPLv3+
  Group:          System Environment/Libraries
@@@ -232,9 -234,9 +232,12 @@@ CXXFLAGS="%optflags -fvisibility=hidde
  %doc %{_datadir}/doc/libopenvrml-%{version}/manual
  
  %changelog
- * Sat Sep 5 2010  Braden McDaniel  <braden at endoframe.com> - 0.18.6-5
++* Sat Sep 14 2010  Braden McDaniel  <braden at endoframe.com> - 0.18.6-6
 +- Changes for the *real* boost-1.44.0.
 +
+ * Wed Aug 04 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0.18.6-5
+ - Rebuild for Boost soname bump.
+ 
  * Sat Jul 31 2010  Braden McDaniel  <braden at endoframe.com> - 0.18.6-4
  - Still need -mt for boost-1.44.0.