This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.

Tamito Kajiyama 3197796cf7 Merged changes in the trunk up to revision 42425. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c

2011-12-05 02:12:49 +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

Merged changes in the trunk up to revision 42116.

2011-11-26 13:11:55 +00:00

rst

corrections for docs

2011-11-28 17:19:25 +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 42425.

2011-12-05 02:12:49 +00:00

sphinx_doc_gen.sh

pass -noaudio when running blender for various utilities - doc-gen and tests.

2011-10-19 21:55:27 +00:00