Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 7 Feb 2018 21:27:08 +0000 (22:27 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 7 Feb 2018 21:27:08 +0000 (22:27 +0100)
commit44aaffc684dabc44047ac9540870045ccfe83aa3
tree57bd85c1baccb209368615a406a874c3a0d1380e
parentb8d376174ca9b372a978c997a25ebf2ff31a9df0
parent00d2dfa93ae8a84b163930246709c50b8ee1e148
Merge branch 'master' into blender2.8
source/blender/windowmanager/intern/wm_files_link.c