Tamito Kajiyama bb1f8d9586 Merged changes in the trunk up to revision 46309. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/editors/interface/resources.c source/blender/editors/mesh/editmesh_tools.c		2012-05-05 11:40:42 +00:00
..
blender-org	fix [#28151] export OBJ don't save the extension	2011-08-03 05:32:07 +00:00
epy	hide overly picky warnings from 'pylint' for pep8 script, indentation edits.	2011-11-19 16:17:35 +00:00
examples	Python: documentation about overriding context members.	2012-05-02 13:28:13 +00:00
rst	patch [#31216] OpenGL urls updated by Julien DUROURE (julien)	2012-05-01 20:45:03 +00:00
sphinx_changelog_gen.py	fix for mistake in api changelog script with function names.	2011-10-02 23:53:41 +00:00
sphinx_doc_gen.py	Merged changes in the trunk up to revision 46045.	2012-04-29 00:59:04 +00:00
sphinx_doc_gen.sh	py api docs - remove sphinx .doctree before zipping, saves some space 18mb --> 3.1 mb	2012-02-12 19:55:25 +00:00