Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 7 Nov 2018 02:40:39 +0000 (13:40 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 7 Nov 2018 02:40:39 +0000 (13:40 +1100)
commit4e11b6f0374226fc05519ce99229261ab703406e
treea645f1d6cd837d56d7082d723b86bedbd9a2574b
parent5f8d3694958a8ff8ea08d5df60155dfa5796e1fa
parent8a014e780e504cb6e851af9a6c1b591e1bd9da0f
Merge branch 'master' into blender2.8
source/blender/editors/space_file/fsmenu.c