Blender Git Loki
Git Commits -> Revision c0d8ed5
Revision c0d8ed5 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, hair_immediate_fixes, temp_constraint_volume, temp_hair_flow, temp_hair_modifiers, temp_motionpaths) November 25, 2014, 13:25 (GMT) |
Merge branch 'master' into gooseberry Conflicts: release/scripts/startup/bl_ui/space_sequencer.py source/blender/blenkernel/BKE_sequencer.h source/blender/blenkernel/intern/sequencer.c source/blender/blenkernel/intern/sound.c source/blender/blenloader/intern/readfile.c source/blender/editors/animation/anim_ops.c source/blender/editors/space_sequencer/sequencer_draw.c source/blender/editors/space_sequencer/sequencer_edit.c source/blender/editors/space_sequencer/sequencer_intern.h source/blender/editors/space_sequencer/sequencer_preview.c source/blender/editors/space_view3d/view3d_draw.c source/blender/editors/space_view3d/view3d_edit.c source/blender/editors/space_view3d/view3d_ops.c source/blender/editors/transform/transform.c source/blender/editors/transform/transform_conversions.c source/blender/editors/transform/transform_snap.c source/blender/makesdna/DNA_space_types.h source/blender/makesdna/DNA_view3d_types.h source/blender/makesrna/intern/rna_space.c |
Commit Details:
Full Hash: c0d8ed55e44cdd47a3366295e0b221cddecc7099
Parent Commits: 435eaa7, 8aed4bb