Blender Git Loki
Git Commits -> Revision 4139dea
Revision 4139dea by Antonis Ryakiotakis (gooseberry, gooseberry_farm, hair_immediate_fixes, hair_system, temp_constraint_volume, temp_hair_flow, temp_hair_modifiers, temp_motionpaths, terrible_consequencer) November 3, 2014, 14:45 (GMT) |
Merge branch 'master' into terrible_consequencer Conflicts: source/blender/editors/include/UI_view2d.h source/blender/editors/space_sequencer/sequencer_edit.c |
Commit Details:
Full Hash: 4139deab00970bc48343d36623b589b200846b96
Parent Commits: d57ce42, f7c5a23