Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 7 Feb 2018 20:54:52 +0000 (21:54 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 7 Feb 2018 20:54:52 +0000 (21:54 +0100)
Conflicts:
source/blender/windowmanager/intern/wm_files_link.c

1  2 
source/blender/windowmanager/intern/wm_files_link.c