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
..
intern	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
CMakeLists.txt	remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n	2011-10-23 17:52:20 +00:00
SConscript	Enable CXX_GUARDEDALLOC support through SCons.	2010-10-08 20:39:56 +00:00
STR_HashedString.h	style cleanup	2012-08-06 10:03:17 +00:00
STR_String.h	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00