Blender Git Loki
Git Commits -> Revision 4b5d02b
Revision 4b5d02b by Antonis Ryakiotakis (soc-2013-paint) July 9, 2014, 21:09 (GMT) |
Merge branch 'master' into soc-2013-paint Conflicts: source/blender/blenkernel/BKE_blender.h source/blender/blenloader/intern/versioning_270.c source/blender/editors/sculpt_paint/paint_stroke.c source/blender/editors/transform/transform.h source/blender/makesdna/DNA_material_types.h |
Commit Details:
Full Hash: 4b5d02b7c4233d3e4129f4406aebe88dabf04d41
Parent Commits: 2788d5f, 53025e9