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

[Bastien Montagne]

Commit: 6704abce7f2dde1811e7c57ce86925974bf19767
Author: Bastien Montagne
Date:   Sat Apr 4 13:19:25 2015 +0200
Branches: asset-engine
https://developer.blender.org/rB6704abce7f2dde1811e7c57ce86925974bf19767

Merge branch 'asset-experiments' into asset-engine

Conflicts:
	source/blender/editors/space_file/filelist.c

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



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