Merge branch 'master' into blender2.8
[blender.git] / release / text / ocio-license.txt
2016-03-29 Sergey SharybinAdd license text for OCIO configuration