Blender Git Loki
Git Commits -> Revision 5a16f29
July 11, 2015, 20:51 (GMT) |
Merge branch 'master' into asset-experiments Conflicts: source/blender/blenlib/intern/BLI_filelist.c source/blender/editors/space_file/file_draw.c source/blender/editors/space_file/file_ops.c source/blender/editors/space_file/filelist.c |
Commit Details:
Full Hash: 5a16f297006b728f4e777f89fa73ee83d062ee1f
Parent Commits: 05017bc, 5c8fc8e