Blender Git Loki
Git Commits -> Revision 718f8fe
April 7, 2016, 13:25 (GMT) |
Merge branch 'master' into asset-experiments Conflicts: source/blender/blenkernel/BKE_library_query.h source/blender/blenkernel/intern/blender.c source/blender/blenkernel/intern/library_query.c |
Commit Details:
Full Hash: 718f8fe55fcc353a2715a71cdb2c96e27aad25f9
Parent Commits: 22f5772, e10ec6e