Blender Git Loki
Git Commits -> Revision 1164721
Revision 1164721 by Julian Eisel (temp_widgets_c++_experiment, temp_widgets_files_refactor, temp_widgets_update_tagging, wiggly-widgets) November 24, 2015, 07:49 (GMT) |
Merge branch 'master' into wiggly-widgets Conflicts: source/blender/editors/include/ED_view3d.h source/blender/makesrna/RNA_enum_types.h |
Commit Details:
Full Hash: 1164721e12f7bf9c49157919fd696f681f8b9b93
Parent Commits: eced830, ef5fff4