Blender Git Loki
Git Commits -> Revision 7414464
Revision 7414464 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths, temp_widgets_c++_experiment, temp_widgets_files_refactor, temp_widgets_update_tagging, UI-experiments, wiggly-widgets) February 5, 2015, 11:08 (GMT) |
Merge branch 'master' into wiggly-widgets Conflicts: source/blender/blenloader/intern/versioning_270.c source/blender/editors/object/object_intern.h source/blender/editors/object/object_ops.c source/blender/editors/space_sequencer/sequencer_draw.c source/blender/editors/space_view3d/view3d_draw.c source/blender/makesdna/DNA_customdata_types.h source/blender/makesrna/intern/rna_object.c |
Commit Details:
Full Hash: 7414464e23d0f222987b6ae1ea2d55d9c5142025
Parent Commits: 363a044, f902bba