Blender Git Loki
Git Commits -> Revision 342cc12
December 12, 2016, 15:32 (GMT) |
Merge branch 'master' into asset-engine Conflicts: source/blender/blenkernel/intern/library.c |
Commit Details:
Full Hash: 342cc1212f95c59ca4e0dbc127c2cd68a1379e49
Parent Commits: 5f852a4, c6c28ea