Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 5 Jun 2018 15:56:18 +0000 (17:56 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 5 Jun 2018 15:56:18 +0000 (17:56 +0200)
commit7ff07ddd01af7923f32cfff087ec1f566cb4a0a8
tree62d0e57111de4d6d6c70b85f0b597b67b1ea652b
parentf0d9dbae0dae4deae84824833096c38e625073cb
parent1628a6858e22d5e49798f84576283debc5cf2819
Merge branch 'master' into blender2.8

Conflicts:
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_files.c