[Bf-blender-cvs] [a9284fd] asset-experiments: Merge branch 'asset-engine' into asset-experiments

Bastien Montagne noreply at git.blender.org
Thu Jan 14 14:39:06 CET 2016


Commit: a9284fd093cce48b113b77f91d64eb0c5e798a2d
Author: Bastien Montagne
Date:   Tue Jan 12 16:23:06 2016 +0100
Branches: asset-experiments
https://developer.blender.org/rBa9284fd093cce48b113b77f91d64eb0c5e798a2d

Merge branch 'asset-engine' into asset-experiments

Conflicts:
	source/blender/blenkernel/intern/library.c

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



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






More information about the Bf-blender-cvs mailing list