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)
commit749caf49845401656d13124b9692e51d0dc77bc5
tree203c5d9be6a0bfe52e992b9b96db886dd592a7bd
parentaf425f3f7a08c09f7fbc7076b364fac75163b296
parent843271d0a5adec1059f91f7fd8854936a1228807
Merge branch 'master' into blender2.8

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