Tamito Kajiyama 4ea2fb8b0a Merged changes in the trunk up to revision 49478. ... Conflicts resolved: source/blender/blenkernel/intern/library.c source/blender/blenloader/intern/readfile.c source/blender/editors/interface/resources.c source/blender/makesrna/intern/rna_scene.c		2012-08-02 00:10:05 +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	code cleanup: assign mode to a variable in the 3d view header and remove some unused imports	2012-07-29 14:07:57 +00:00
rst	Documentation:	2012-07-29 01:38:31 +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 49478.	2012-08-02 00:10:05 +00:00
sphinx_doc_gen.sh	minor fixes	2012-06-11 12:13:41 +00:00