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
..
blender_file_format	pass -noaudio when running blender for various utilities - doc-gen and tests.	2011-10-19 21:55:27 +00:00
build_systems	Remove some more $Id$ that still were left after r41227 and r41228.	2011-10-23 19:01:59 +00:00
doxygen	use (const char*) rather than (char*) where possible.	2011-11-05 11:04:28 +00:00
guides	== docs ==	2010-10-13 14:44:22 +00:00
license	== docs ==	2010-10-13 14:44:22 +00:00
manpage	picky edits & regen man page	2011-12-10 01:07:22 +00:00
python_api	Merged changes in the trunk up to revision 42902.	2011-12-27 22:12:46 +00:00