Tamito Kajiyama 8135cc9f95 Merged changes in the trunk up to revision 47700. ...

Conflicts resolved:
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/WM_types.h

2012-06-10 20:50:43 +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

Added example of basic objects ooperations in Python, liek adding object

2012-06-06 10:01:17 +00:00

rst

patch [#31594] [Documentation]: fix for example in bge.render.rst

2012-05-25 12:37:14 +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