Commit: d296a846c67be6d20d3f4b3cb7da601b575edb1c
Author: Antonio Vazquez
Date: Mon Jun 11 17:41:11 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBd296a846c67be6d20d3f4b3cb7da601b575edb1c
Merge branch 'blender2.8' into greasepencil-object
Conflicts:
release/scripts/startup/bl_ui/space_view3d.py
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
