Tamito Kajiyama cc3adc2202 Merged changes in the trunk up to revision 43038. ... Conflicts resolved: source/blender/makesdna/DNA_material_types.h source/blenderplayer/bad_level_call_stubs/stubs.c		2011-12-31 21:09:26 +00:00
..
bad_level_call_stubs	Merged changes in the trunk up to revision 43038.	2011-12-31 21:09:26 +00:00
CMakeLists.txt	remove duplicate extern_colamd from blenderplayer cmake	2011-11-28 08:38:08 +00:00