80c7f0498b
Conflicts: .gitignore
9 lines
246 B
Plaintext
9 lines
246 B
Plaintext
/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
|