Tamito Kajiyama 70aa63306a Merged changes in the trunk up to revision 34996. ...

Conflicts resolved:
C:\bf-blender\soc-2008-mxcurioni\doc\python_api\sphinx_doc_gen.py
C:\bf-blender\soc-2008-mxcurioni\source\blender\makesrna\RNA_types.h
C:\bf-blender\soc-2008-mxcurioni\source\blender\render\SConscript

2011-02-19 23:51:18 +00:00

..

blender-org

…

epy

removing epydocs for mathutils and geometry mododules (now they are in sphinx)

2011-01-01 23:53:48 +00:00

examples

SVN maintenance.

2011-02-18 19:33:19 +00:00

rst

…

sphinx_doc_gen.py

Merged changes in the trunk up to revision 34996.

2011-02-19 23:51:18 +00:00

sphinx_doc_gen.sh

- cmake was missing an inclide (IDE's wouldnt index)

2011-02-06 10:18:20 +00:00