Blender Git Loki
Git Commits -> Revision 948f20e
August 2, 2016, 14:48 (GMT) |
Merge branch 'master' into asset-engine Conflicts: source/blender/windowmanager/intern/wm_files_link.c |
Commit Details:
Full Hash: 948f20e74a5613b477f67810a802003e65056c91
Parent Commits: 2f5db2e, b6540eb