Blender Git Loki
Git Commits -> Revision 32c7e22
Revision 32c7e22 by Tamito Kajiyama (master) June 11, 2011, 00:22 (GMT) |
Merged changes in the trunk up to revision 37388. Conflicts resolved: release/scripts/startup/bl_ui/properties_render.py source/creator/SConscript source/blender/blenlib/intern/bpath.c source/blender/editors/space_outliner/outliner.c |
Commit Details:
Full Hash: 32c7e22d3696e3575f4b7d05c1f7140591e88809
SVN Revision: 37392
Parent Commits: 6fb82a8, dfcd015