Blender Git Loki
Git Commits -> Revision a7cfb5f
January 12, 2016, 15:08 (GMT) |
Merge branch 'master' into asset-engine Conflicts: source/blender/blenkernel/intern/library.c |
Commit Details:
Full Hash: a7cfb5fc22e9efd8f0dd0549a273613a5903bad0
Parent Commits: 46e6f3b, 7142bf6