Blender Git Loki
Git Commits -> Revision 4696bce
April 4, 2015, 11:15 (GMT) |
Merge branch 'asset-experiments' into asset-engine Conflicts: source/blender/editors/space_file/file_ops.c source/blender/editors/space_file/filelist.c source/blender/editors/space_file/filelist.h |
Commit Details:
Full Hash: 4696bce25735e9cfa1bd4112074dcc3d958bd479
Parent Commits: bbfe065, f2e55db