Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 22 Oct 2018 03:59:12 +0000 (14:59 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 22 Oct 2018 03:59:12 +0000 (14:59 +1100)
commit71466cac1efae5e942596ec25c8787478f8356b0
tree6915cecf1e70e9f8139c31097ae42b1c73130221
parent7756973b0c35c5759db240158717d0f5bf0f45dc
parent64a6c78a9a2a789b5be6ba5e3162a10f90a2ac5c
Merge branch 'master' into blender2.8

Reverts: 92fd931e536
source/blender/windowmanager/intern/wm_files.c