Blender Git Loki
Git Commits -> Revision ce03ec4
Revision ce03ec4 by Tamito Kajiyama (master) July 20, 2011, 23:33 (GMT) |
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 |
Commit Details:
Full Hash: ce03ec4b866a3e1a6f19a266bf2c38c2c4b4afd0
SVN Revision: 38549
Parent Commits: 4c31400, 76e91d7