Bastien Montagne 97ee7f8609 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/intern/readfile.c
	source/blender/editors/physics/particle_edit.c

2016-06-22 13:12:44 +02:00

..

bin

Simplify thumbnail blend parser

2015-08-17 12:37:38 +10:00

darwin

Revert "OSX/cpack: add a dummy bg and ds_store for dmg"

2014-11-18 11:40:16 +01:00

datafiles

UI Font: Fix bad kerning of Thai font.

2016-06-11 10:47:53 +02:00

freedesktop

Update of our *nix .desktop file.

2015-08-27 16:31:13 +02:00

scripts

Merge branch 'master' into blender2.8

2016-06-22 13:12:44 +02:00

text

Add license text for OCIO configuration

2016-03-29 12:54:29 +02:00

windows

move windows out of source dir

2016-02-07 20:58:58 +11:00