Tamito Kajiyama 15ed834343 Merged changes in the trunk up to revision 51718. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_scene.c
release/datafiles/startup.blend

2012-10-29 01:09:12 +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

* Fix small bug in Python operator example; improved example of modal operator

2012-10-12 18:19:39 +00:00

rst

style cleanup

2012-10-27 10:42:28 +00:00

sphinx_changelog_gen.py

api changelog for 2.64 and 2.63 (which I missed last release)

2012-10-09 01:07:08 +00:00

sphinx_doc_gen.py

Merged changes in the trunk up to revision 51448.

2012-10-20 16:48:48 +00:00

sphinx_doc_gen.sh

minor fixes

2012-06-11 12:13:41 +00:00