Blender Git Loki
Git Commits -> Revision 3df52d4
Revision 3df52d4 by Tamito Kajiyama (master) April 11, 2011, 00:09 (GMT) |
Merged changes in the trunk up to revision 36092. Conflicts resolved: source/blender/makesrna/SConscript source/blender/makesrna/intern/CMakeLists.txt source/blender/render/intern/source/pipeline.c |
Commit Details:
Full Hash: 3df52d4e19790df7a7a9c80e37c5724613427b86
SVN Revision: 36093
Parent Commits: 09c7d5a, e37dc17