Merged changes in the trunk up to revision 39759.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 28 Aug 2011 23:25:13 +0000 (23:25 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 28 Aug 2011 23:25:13 +0000 (23:25 +0000)
1  2 
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c

Simple merge