Tamito Kajiyama ce03ec4b86 Merged changes in the trunk up to revision 38543. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt

2011-07-20 23:33:10 +00:00

..

blender-org

Python Docs: update layout.html to match blender.org development submenu changes.

2011-06-16 16:13:26 +00:00

epy

moving BGL to rst format, first move file.

2011-07-01 11:13:26 +00:00

examples

SVN maintenance.

2011-07-13 00:49:22 +00:00

rst

rename bgl.Buffer attribute list to a method, to_list() as used for IDProps, also made repr function nicer.

2011-07-13 23:45:47 +00:00

sphinx_changelog_gen.py

update automatic rna changelog

2011-06-22 12:05:24 +00:00

sphinx_doc_gen.py

Merged changes in the trunk up to revision 38543.

2011-07-20 23:33:10 +00:00

sphinx_doc_gen.sh

minor improvements to sphinx doc main page

2011-04-13 14:43:11 +00:00