Blender Git Loki
Git Commits -> Revision 6b6a968
Revision 6b6a968 by Martin Felke (fracture_modifier, fracture_modifier-master, temp-fracture-modifier-2.8) December 31, 2014, 12:59 (GMT) |
Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier Conflicts: extern/SConscript release/datafiles/splash.png release/datafiles/splash_2x.png source/blender/blenkernel/intern/rigidbody.c source/blender/editors/physics/rigidbody_constraint.c source/blender/makesrna/intern/rna_modifier.c source/blender/modifiers/intern/MOD_boolean_util.c source/blender/windowmanager/WM_api.h |
Commit Details:
Full Hash: 6b6a968053cd8bb031049094bfc2da8e983e8969
Parent Commits: 480ed9d, a3e832e