Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Wed, 11 Apr 2018 13:07:03 +0000 (15:07 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Wed, 11 Apr 2018 13:07:03 +0000 (15:07 +0200)
commit9ec26c415a183673e02fdadf2f1bd47c5a8bc526
tree409dcd54d7eb9af94eac768e7e4749c0c5fe4884
parentce3adc090d6cb380e345b0112079b01a61aa3544
parent8aa6e4d50bfcc0d83985f783228408586b0f877b
Merge branch 'master' into blender2.8
source/blender/editors/space_file/file_draw.c