[OpenImageIO/f18: 2/3] Merge branch 'f18' of ssh://pkgs.fedoraproject.org/OpenImageIO into f18

[Richard Shaw]

commit 7d08fd88b99f54b0856a810569651cbf62dfd59d
Merge: 1d5ff86 9a30ce9
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Wed Aug 28 14:16:37 2013 -0500

    Merge branch 'f18' of ssh://pkgs.fedoraproject.org/OpenImageIO into f18
    
    Conflicts:
    	OpenImageIO.spec

 OpenImageIO.spec |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --cc OpenImageIO.spec
index ebcb3e9,ee2463c..96913ea
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@@ -1,6 -1,6 +1,11 @@@
  Name:           OpenImageIO
++<<<<<<< HEAD
 +Version:        1.0.12
 +Release:        1%{?dist}
++=======
+ Version:        1.0.11
+ Release:        2%{?dist}
++>>>>>>> 9a30ce92df4cfbcc8aa2a22d54e197e49f13b31e
  Summary:        Library for reading and writing images
  
  Group:          Development/Libraries
@@@ -159,9 -159,9 +164,13 @@@ cp -a doc/*.1 %{buildroot}%{_mandir}/ma
  
  
  %changelog
++<<<<<<< HEAD
 +* Wed Aug 28 2013 Richard Shaw <hobbes1069 at gmail.com> - 1.0.12-1
 +- Update to latest upstream patch release.
 +
+ * Wed Jan 23 2013 Rex Dieter <rdieter at fedoraproject.org> 1.0.11-2
+ - rebuild (libwebp)
+ 
  * Thu Jan 17 2013 Richard Shaw <hobbes1069 at gmail.com> - 1.0.11-1
  - Update to latest upstream patch release.