Commit: 948f20e74a5613b477f67810a802003e65056c91
Author: Bastien Montagne
Date: Tue Aug 2 16:48:31 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB948f20e74a5613b477f67810a802003e65056c91
Merge branch 'master' into asset-engine
Conflicts:
source/blender/windowmanager/intern/wm_files_link.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
