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
..
CMakeLists.txt	remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n	2011-10-23 17:52:20 +00:00
SConscript	I swear, it was just an innocence change in guardedalloc!	2011-02-21 12:35:04 +00:00
stubs.c	Merged changes in the trunk up to revision 43038.	2011-12-31 21:09:26 +00:00