Blender Git Loki
Git Commits -> Revision 4398536
January 30, 2019, 22:04 (GMT) |
Merge branch 'master' into asset-engine Conflicts: source/blender/blenkernel/BKE_library.h source/blender/blenloader/BLO_readfile.h source/blender/editors/space_file/file_ops.c source/blender/editors/space_file/filelist.c source/blender/editors/space_file/filelist.h source/blender/makesdna/DNA_space_types.h source/blender/windowmanager/intern/wm_files_link.c |
Commit Details:
Full Hash: 43985368a1c83fa736bef70178fdf61e41c5a178
Parent Commits: 2ed89aa, b21bd43