Blender Git Loki
Git Commits -> Revision b3c0b59
January 26, 2015, 16:38 (GMT) |
Merge branch 'master' into asset-experiments Conflicts: source/blender/blenloader/intern/readfile.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: b3c0b59825023477827162beb3ea426f67cc842f
Parent Commits: 6f1e2e5, 7bc6fbf