blender

Files

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

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

2011-03-05 09:27:14 +00:00

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

remove nan-makefiles

2011-01-30 15:29:22 +00:00

2011-03-12 20:34:17 +00:00

remove nan-makefiles

2011-01-30 15:29:22 +00:00

2011-02-25 13:25:53 +00:00

2011-03-12 04:31:28 +00:00

CMakeLists.txt

2011-01-23 11:42:29 +00:00

SConscript

…