Commit: bcc020b1bc1b60f6cbd6d2c9bf400744931e57e1
Author: Bastien Montagne
Date: Mon Jul 25 19:33:55 2016 +0200
Branches: asset-experiments
https://developer.blender.org/rBbcc020b1bc1b60f6cbd6d2c9bf400744931e57e1
Merge branch 'asset-engine' into asset-experiments
Conflicts:
source/blender/blenloader/intern/readfile.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
