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-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

rst bge touch ups: making the title of the examples slightly more noticeable

2012-01-23 19:53:23 +00:00

rst

Fixed a couple of typos in the Python API docs

2012-03-23 14:29:59 +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 45133.

2012-03-25 08:20:19 +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