Blender Git Loki
Git Commits -> Revision 21c06c4
Revision 21c06c4 by Martin Felke (fracture_modifier, fracture_modifier-master, temp-fracture-modifier-2.8) May 17, 2014, 10:56 (GMT) |
Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier_oldsim Conflicts: source/blender/blenkernel/intern/DerivedMesh.c source/blender/blenkernel/intern/rigidbody.c source/blender/blenkernel/intern/smoke.c source/blender/editors/space_buttons/buttons_context.c |
Commit Details:
Full Hash: 21c06c40f4b74ce1cb60f118fe1da8d351cd09a3
Parent Commits: 1e8aca9, ef2ba65