Tamito Kajiyama a42ba82f63 Merged changes in the trunk up to revision 50829. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/render/intern/source/convertblender.c source/blender/render/intern/source/pipeline.c Also addressed code inconsistency due to changes in the trunk revision 50628 (color management with OCIO) and 50806 (UV project material). OCIO-related changes are marked OCIO_TODO as in some other files modified in revision 50628.		2012-09-23 18:50:56 +00:00
..
gears	code clenup: comments and some style edits on ghost/osx (odd indentation)	2012-09-06 02:10:09 +00:00
multitest	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
CMakeLists.txt	ghost tests weren't building and added some comments to ghost docs.	2012-01-18 10:16:39 +00:00