Tamito Kajiyama 9ca7f6659f Merged changes in the trunk up to revision 44419. ... Conflicts resolved: doc/python_api/sphinx_doc_gen.py source/blender/blenloader/intern/readfile.c source/blender/editors/space_view3d/drawobject.c source/creator/CMakeLists.txt		2012-02-25 01:26:45 +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 44419.	2012-02-25 01:26:45 +00:00
creator.c	Merged changes in the trunk up to revision 44266 (including BMesh).	2012-02-21 01:40:04 +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