Tamito Kajiyama 0896a22723 Merged changes in the trunk up to revision 42902. ... Conflicts resolved: source/blender/editors/space_view3d/drawobject.c source/blender/makesdna/DNA_mesh_types.h source/blender/python/intern/bpy.c		2011-12-27 22:12:46 +00:00
..
buildinfo.c	remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n	2011-10-23 17:52:20 +00:00
CMakeLists.txt	Merged changes in the trunk up to revision 42902.	2011-12-27 22:12:46 +00:00
creator.c	Merged changes in the trunk up to revision 42902.	2011-12-27 22:12:46 +00:00
SConscript	Shuffle some build code around to ensure debug builds on Windows actually run too.	2011-06-08 11:53:07 +00:00