[Bf-blender-cvs] [948f20e] asset-engine: Merge branch 'master' into asset-engine

Bastien Montagne noreply at git.blender.org
Tue Aug 2 17:36:13 CEST 2016


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

===================================================================



===================================================================






More information about the Bf-blender-cvs mailing list