Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 7 Feb 2018 21:19:11 +0000 (22:19 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 7 Feb 2018 21:19:11 +0000 (22:19 +0100)
commitb8d376174ca9b372a978c997a25ebf2ff31a9df0
treea11f64c8a438d17a744c1223c62337443691bc20
parent749caf49845401656d13124b9692e51d0dc77bc5
parent49745aa5ff63d054d36b3384ecb37835307e149c
Merge branch 'master' into blender2.8

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