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
..
__init__.py	re-arrange build files so scons "config" dir isnt confused with ~/.blender/2.52/config	2010-07-12 18:26:35 +00:00
bcolors.py	re-arrange build files so scons "config" dir isnt confused with ~/.blender/2.52/config	2010-07-12 18:26:35 +00:00
Blender.py	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
btools.py	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
crossmingw.py	re-arrange build files so scons "config" dir isnt confused with ~/.blender/2.52/config	2010-07-12 18:26:35 +00:00
mstoolkit.py	Whitespace tweaks	2011-11-10 10:34:26 +00:00