Blender Git Loki
Git Commits -> Revision cc3adc2
Revision cc3adc2 by Tamito Kajiyama (master) December 31, 2011, 21:09 (GMT) |
Merged changes in the trunk up to revision 43038. Conflicts resolved: source/blender/makesdna/DNA_material_types.h source/blenderplayer/bad_level_call_stubs/stubs.c |
Commit Details:
Full Hash: cc3adc2202ce0208b1c95bc3fe3f0290b3b511f9
SVN Revision: 43044
Parent Commits: 0896a22, b559529