Tamito Kajiyama 556912792a Merged changes in the trunk up to revision 54110. ... Conflicts resolved: source/blender/blenfont/SConscript source/blender/blenkernel/intern/subsurf_ccg.c source/blender/makesdna/intern/makesdna.c source/blender/makesrna/intern/rna_scene.c		2013-01-26 23:49:13 +00:00
..
blender_file_format	switch verious references from py3.2 -> 3.3 or just 3.	2012-11-26 13:58:06 +00:00
build_systems	Spellfixes: colour -> color	2012-07-04 12:19:50 +00:00
doxygen	move bmesh wiki docs into bmesh header and update doxygen.	2012-02-27 20:27:19 +00:00
guides	patch [#32791] Spelling mistakes corrected.	2012-10-07 03:26:30 +00:00
license	== docs ==	2010-10-13 14:44:22 +00:00
manpage	osl style cleanup and update man-page.	2012-12-04 03:18:08 +00:00
python_api	Merged changes in the trunk up to revision 54110.	2013-01-26 23:49:13 +00:00