Blender Git Loki
Git Commits -> Revision 3993965
January 4, 2015, 17:43 (GMT) |
Merge branch 'master' into asset-experiments Conflicts: source/blender/editors/space_file/file_draw.c source/blender/editors/space_file/filelist.c source/blender/editors/space_file/filesel.c source/blender/makesdna/DNA_space_types.h source/blender/windowmanager/intern/wm_operators.c |
Commit Details:
Full Hash: 3993965bd7a7951e40135ba27c7da2ff80dfd50d
Parent Commits: 97a00b9, a08c5e1