Commit: 3ff6b1b79e91a48180c42cc5c3a5bdca037e683e
Author: Antonioya
Date: Fri Mar 8 08:44:03 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB3ff6b1b79e91a48180c42cc5c3a5bdca037e683e
Merge branch 'master' into greasepencil-object
Conflicts:
source/blender/blenloader/intern/versioning_280.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
