OpenImageIO/.gitignore
Richard M. Shaw 80c7f0498b Merge branch 'master' into f15
Conflicts:
	.gitignore
2011-11-07 08:19:03 -06:00

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