[Bf-blender-cvs] [7629a78] gooseberry: Merge branch 'alembic' into gooseberry

[Lukas Tönne]

Commit: 7629a78b2ac20b1b70f8c400d33ee95dbaea95ff
Author: Lukas Tönne
Date:   Thu May 14 16:49:51 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB7629a78b2ac20b1b70f8c400d33ee95dbaea95ff

Merge branch 'alembic' into gooseberry

Conflicts:
	source/blender/blenkernel/intern/mesh.c
	source/blender/depsgraph/intern/depsgraph_build_relations.cc

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



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