Blender Git Loki
Git Commits -> Revision 97a00b9
January 3, 2015, 21:05 (GMT) |
Merge branch 'master' into asset-experiments Conflicts: release/scripts/startup/bl_ui/space_filebrowser.py source/blender/editors/space_file/filelist.c source/blender/editors/space_file/filelist.h source/blender/editors/space_file/space_file.c source/blender/makesdna/DNA_space_types.h source/blender/makesrna/intern/rna_space.c |
Commit Details:
Full Hash: 97a00b91998b101328ad7192611c43362f17dd47
Parent Commits: d237ac4, dcc5997