rpms
/
OpenImageIO
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge conflicts.

This commit is contained in:
Richard M. Shaw 2013-08-28 14:17:16 -05:00
parent 7d08fd88b9
commit 15e17eb566
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenImageIO.spec
View File

@ -1,11 +1,6 @@
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
@ -164,7 +159,6 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
%changelog
<<<<<<< HEAD
* Wed Aug 28 2013 Richard Shaw <hobbes1069@gmail.com> - 1.0.12-1
- Update to latest upstream patch release.