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
..
ffmpeg	Reduce amount of deprecated symbols used from FFmpeg	2012-06-18 10:29:11 +00:00
fftw	unify include guard defines, __$FILENAME__	2012-02-17 18:59:41 +00:00
FX	Merged changes in the trunk up to revision 50829.	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
jack	unify include guard defines, __$FILENAME__	2012-02-17 18:59:41 +00:00
OpenAL	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
Python	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
SDL	unify include guard defines, __$FILENAME__	2012-02-17 18:59:41 +00:00
sndfile	unify include guard defines, __$FILENAME__	2012-02-17 18:59:41 +00:00
SRC	unify include guard defines, __$FILENAME__	2012-02-17 18:59:41 +00:00
CMakeLists.txt	Make blender compilable by gcc-4.7 and strict compilation flags:	2012-05-14 13:31:38 +00:00
COPYING	Relicensing audaspace under GPL 2 or later.	2011-02-18 23:47:37 +00:00
SConscript	Add libMV and Scons support for MinGW-w64, patches by Caleb Joseph with slight modifications.	2012-04-24 12:57:58 +00:00