Tamito Kajiyama 3b711a6ed0 Merged changes in the trunk up to revision 45133. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/writefile.c source/blender/bmesh/intern/bmesh_construct.c source/blender/bmesh/intern/bmesh_mesh_conv.c source/blender/bmesh/intern/bmesh_mesh_conv.h source/blender/editors/interface/interface_templates.c source/blender/editors/interface/resources.c source/blender/editors/mesh/bmesh_select.c source/blender/editors/mesh/bmesh_tools.c source/blender/editors/space_view3d/drawobject.c source/blender/render/intern/source/shadeoutput.c		2012-03-25 08:20:19 +00:00
..
blender_file_format	Code Cleanup: check is / is not when comparing singletons.	2012-02-02 21:07:56 +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	move bmesh wiki docs into bmesh header and update doxygen.	2012-02-27 20:27:19 +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 45133.	2012-03-25 08:20:19 +00:00