Tamito Kajiyama 2585d52405 Merged changes in the trunk up to revision 46045. ... Conflicts resolved: doc/python_api/sphinx_doc_gen.py source/blender/blenkernel/intern/subsurf_ccg.c source/blender/editors/mesh/editmesh_tools.c source/blender/makesdna/DNA_scene_types.h		2012-04-29 00:59:04 +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 46045.	2012-04-29 00:59:04 +00:00
creator.c	Merged changes in the trunk up to revision 45820.	2012-04-21 00:33:36 +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