Tamito Kajiyama c8deda3276 Merged changes in the trunk up to revision 35505. ...

Conflicts resolved:
source/blender/makesdna/DNA_material_types.h

2011-03-13 02:10:39 +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 35505.

2011-03-13 02:10:39 +00:00

creator.c

Merged changes in the trunk up to revision 35203.

2011-02-26 20:21:09 +00:00

SConscript

Merged changes in the trunk up to revision 32886.

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