Tamito Kajiyama 3df52d4e19 Merged changes in the trunk up to revision 36092. ...

Conflicts resolved:
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c

2011-04-11 00:09:56 +00:00

..

buildinfo.c

fix #if errors, add defined() in proper places

2011-02-25 10:01:33 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 36092.

2011-04-11 00:09:56 +00:00

creator.c

Merged changes in the trunk up to revision 36092.

2011-04-11 00:09:56 +00:00

SConscript

Merged changes in the trunk up to revision 32886.

2010-11-05 21:49:36 +00:00