Blender Git Loki
Git Commits -> Revision c5ede37
Revision c5ede37 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, temp_constraint_volume, temp_hair_modifiers, temp_motionpaths) January 5, 2015, 11:24 (GMT) |
Merge branch 'wiggly-widgets' into gooseberry Conflicts: source/blender/makesrna/intern/rna_object.c source/blenderplayer/bad_level_call_stubs/stubs.c |
Commit Details:
Full Hash: c5ede37a9e936fa0971385e18b4a47274f51c991
Parent Commits: f902bba, f929c03