Merged changes in the trunk up to revision 44797.

Browse Source

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_mesh.c

...

This commit is contained in:

Tamito Kajiyama

2012-03-10 21:56:23 +00:00

parent e9eed190e8 e09ab8883c

commit a2ebfc82db

828 changed files with 28231 additions and 25725 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

842

doc/python_api/sphinx_doc_gen.py

File diff suppressed because it is too large Load Diff