Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 7 Dec 2018 04:54:17 +0000 (15:54 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 7 Dec 2018 04:54:17 +0000 (15:54 +1100)
commit606223f6a61fb21606ac6faf10aed963c524a3c7
tree0913a2a0fc085751adf336700784323371e0d4d3
parent0c6d5232a3999770accf0433b436a3bdf5f6f7a8
parentd6d76759f8493ca156c597840f9d41a64e326eba
Merge branch 'master' into blender2.8
source/blender/windowmanager/intern/wm_files.c