Blender Git Loki
Git Commits -> Revision 9af4ff0
Revision 9af4ff0 by Julian Eisel (temp_widgets_c++_experiment, temp_widgets_files_refactor, temp_widgets_update_tagging, wiggly-widgets) December 3, 2015, 13:30 (GMT) |
Merge branch 'master' into wiggly-widgets Conflicts: source/blender/blenloader/intern/versioning_270.c source/blender/editors/interface/resources.c source/blender/editors/screen/glutil.c source/blender/editors/space_view3d/view3d_draw.c source/blender/editors/transform/transform_manipulator.c |
Commit Details:
Full Hash: 9af4ff0465b451ac979976b405a7e7e246632850
Parent Commits: 9019523, ef4a83d