Blender Git Loki
Git Commits -> Revision 5373b4a
Revision 5373b4a by Antonis Ryakiotakis (gooseberry, gooseberry_farm, hair_immediate_fixes, temp_constraint_volume, temp_hair_flow, temp_hair_modifiers, temp_motionpaths, viewport_experiments) November 25, 2014, 15:31 (GMT) |
Merge branch 'master' into viewport_experiments Conflicts: source/blender/editors/space_view3d/view3d_draw.c source/blender/gpu/intern/gpu_extensions.c |
Commit Details:
Full Hash: 5373b4a8b17eb6f25cacaa979f196cea32910f79
Parent Commits: 9f64a86, ec69df6