sync with master

This commit is contained in:
Richard M. Shaw 2011-11-10 09:05:19 -06:00
parent 80c7f0498b
commit af16255f32
2 changed files with 0 additions and 7 deletions

4
.gitignore vendored
View File

@ -1,8 +1,4 @@
/OpenImageIO-oiio-Release-0.10.0-12-g8055b0f.tar.gz
/OpenImageIO-oiio-Release-0.10.1-0-g8c102cf.tar.gz
/OpenImageIO-oiio-Release-0.10.2-0-g7a6cba8.tar.gz
<<<<<<< HEAD
clog
=======
/OpenImageIO-oiio-Release-0.10.3-0-ge93cd33.tar.gz
>>>>>>> master

View File

@ -117,9 +117,6 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
* Thu Aug 27 2011 Tom Callaway <spot@fedoraproject.org> - 0.10.2-1
- Update to 0.10.2
* Sat Aug 27 2011 Richard Shaw <hobbes1069@gmail.com> - 0.10.1-3
- rebuild for broken deps
* Thu Aug 04 2011 Richard Shaw <hobbes1069@gmail.com> - 0.10.1-2
- New upstream release.
- Fix private shared object provides with python library.