Blender Git Loki
Git Commits -> Revision e4bc201
Revision e4bc201 by Lukas Toenne (temp_merge_gooseberry_hair) January 19, 2015, 19:43 (GMT) |
Fixed a couple of small merge errors. Conflicts: source/blender/blenkernel/BKE_blender.h source/blender/blenloader/intern/versioning_270.c source/blender/makesrna/intern/rna_modifier.c |
Commit Details:
Full Hash: e4bc2013ea879571d325e9a27cb2198b3de0e0a8
Parent Commits: 2f4aef9, 4eb113d