blender/release
Bastien Montagne 2a7f8d3cb3 Merge branch 'master' into blender2.8
Conflicts:
	source/blender/blenlib/BLI_math_matrix.h
	source/blender/blenlib/intern/math_matrix.c
	source/blender/blenlib/intern/rand.c
	source/blender/editors/animation/anim_channels_edit.c
	source/blender/makesrna/intern/rna_mask.c
2017-11-15 10:46:19 +01:00
..
bin Cleanup: spelling 2017-04-27 21:41:03 +10:00
darwin set required MacOS version to 10.9 2017-03-16 15:02:55 -04:00
datafiles Merge branch 'master' into blender2.8 2017-11-15 10:46:19 +01:00
freedesktop Update of our *nix .desktop file. 2015-08-27 16:31:13 +02:00
scripts Merge branch 'master' into blender2.8 2017-11-15 10:46:19 +01:00
text This copyright text (copied to binary distros) had a confusing statement about 2017-08-25 11:11:19 +02:00
windows Build: add scripts to build dependencies for Windows and macOS. 2017-08-07 17:54:26 +02:00