Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 22 Oct 2018 08:55:16 +0000 (10:55 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 22 Oct 2018 08:55:16 +0000 (10:55 +0200)
commit0e70feab22fd0871d61a03b43c591fb300990de7
treef95ce4dba82bd23b21dc5987be1babc4e0475fb1
parent91b768ccb1f42461668cea61fd1d72d64ab1d14a
parent32d66889e992a82f3e56c0d43b06c0f4a89a08f7
Merge branch 'master' into blender2.8

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