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
..
2011-02-27 19:31:27 +00:00
2011-02-27 19:31:27 +00:00
2011-02-27 19:31:27 +00:00
2011-02-27 19:31:27 +00:00
2011-02-27 19:31:27 +00:00
2011-02-27 19:31:27 +00:00
2011-02-27 19:31:27 +00:00
2011-02-27 19:31:27 +00:00
2011-02-27 19:31:27 +00:00
2011-06-20 15:17:02 +00:00
2011-07-20 23:33:10 +00:00
2011-02-27 19:31:27 +00:00
2011-02-27 19:31:27 +00:00
2011-02-27 19:31:27 +00:00
2011-02-27 19:31:27 +00:00
2011-05-10 13:11:36 +00:00
2011-02-27 19:31:27 +00:00
2011-02-27 19:31:27 +00:00
2011-02-27 19:31:27 +00:00
2011-04-02 02:08:33 +00:00
2011-02-27 19:31:27 +00:00
2011-02-27 19:31:27 +00:00
2011-02-27 19:31:27 +00:00
2011-02-27 19:31:27 +00:00