Blender Git Loki
Git Commits -> Revision 99869da
June 27, 2016, 15:29 (GMT) |
Merge branch 'master' into asset-experiments Conflicts: source/blender/blenkernel/BKE_library.h source/blender/blenkernel/intern/brush.c source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/library_remap.c source/blender/blenkernel/intern/mesh.c source/blender/blenloader/BLO_readfile.h source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/writefile.c source/blender/editors/space_action/space_action.c source/blender/editors/space_clip/space_clip.c source/blender/editors/space_file/filelist.c source/blender/editors/space_graph/space_graph.c source/blender/editors/space_image/space_image.c source/blender/editors/space_logic/space_logic.c source/blender/editors/space_nla/space_nla.c source/blender/editors/space_node/space_node.c source/blender/editors/space_outliner/outliner_edit.c source/blender/editors/space_sequencer/space_sequencer.c source/blender/editors/space_text/space_text.c source/blender/editors/space_view3d/space_view3d.c source/blender/makesrna/intern/rna_ID.c source/blender/makesrna/intern/rna_main_api.c source/blender/windowmanager/intern/wm_files_link.c source/blender/windowmanager/wm_files.h |
Commit Details:
Full Hash: 99869dab7c05323192bb117d5b3c6960cc7b1b4b
Parent Commits: d012380, e2c7ee7