Blender Git Loki
Git Commits -> Revision 6b378a8
Revision 6b378a8 by Antonis Ryakiotakis (soc-2013-paint) May 21, 2014, 07:12 (GMT) |
Merge branch 'master' into soc-2013-paint Conflicts: source/blender/blenloader/intern/versioning_270.c source/blender/makesrna/intern/rna_brush.c source/blender/makesrna/intern/rna_internal.h |
Commit Details:
Full Hash: 6b378a869a763372e3f809c43f9bd7c6a38b2117
Parent Commits: 038965c, 358664a