Blender Git Loki
Git Commits -> Revision 02c142e
Revision 02c142e by Antonis Ryakiotakis (gooseberry, gooseberry_farm, temp_motionpaths, temp_widgets_c++_experiment, temp_widgets_files_refactor, temp_widgets_update_tagging, UI-experiments, wiggly-widgets) March 9, 2015, 11:40 (GMT) |
Merge branch 'master' into wiggly-widgets Conflicts: source/blender/blenloader/intern/versioning_270.c source/blender/editors/include/ED_view3d.h source/blender/editors/space_sequencer/sequencer_draw.c source/blender/editors/space_view3d/view3d_draw.c source/blender/makesdna/DNA_view3d_types.h |
Commit Details:
Full Hash: 02c142e58295be63681e7c593179fce2e9d43311
Parent Commits: 81c56d1, a1549bc