Blender Git Loki
Git Commits -> Revision d7fa60a
Revision d7fa60a by Julian Eisel (temp_widgets_c++_experiment, temp_widgets_files_refactor, temp_widgets_update_tagging, wiggly-widgets) November 5, 2015, 11:48 (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/interface/resources.c source/blender/editors/space_graph/space_graph.c source/blender/editors/space_image/image_draw.c source/blender/editors/transform/transform_manipulator.c |
Commit Details:
Full Hash: d7fa60ad1495fa452e6f6f6d20d24f9616d489b0
Parent Commits: 06ef778, 6ec01dc