Blender Git Loki
Git Commits -> Revision acd076a
May 11, 2015, 15:09 (GMT) |
Merge branch 'master' into asset-experiments Conflicts: source/blender/blenkernel/BKE_icons.h source/blender/blenkernel/intern/icons.c source/blender/editors/include/UI_interface_icons.h source/blender/editors/interface/interface_icons.c source/blender/makesrna/intern/rna_ID.c |
Commit Details:
Full Hash: acd076a9f341f83fb0a3b88372416b349bbff37f
Parent Commits: 4fc3188, bf583c8