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

Fix git conflict.

This commit is contained in:
Richard M. Shaw 2012-06-14 09:38:50 -05:00
parent 3de092e48b
commit d728195f5a
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sources
View File

@ -1,5 +1 @@
<<<<<<< HEAD
0c52da04fad3333f22433bd5d52cd134 OpenImageIO-oiio-Release-0.10.8-0-g1e37127.tar.gz
=======
4c3955348d0232bbd2a8f60ff41ad161 OpenImageIO-oiio-Release-1.0.5-0-g28ba675.tar.gz
>>>>>>> master