Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 19 Jul 2017 04:38:22 +0000 (14:38 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 19 Jul 2017 04:38:22 +0000 (14:38 +1000)
commitdd64cedd0b6b2bda4819e7093029f2a216f3082d
tree0caa799820af51031b51501f24345d0e6e257a2e
parent231d68821989deb9024b801690b63069f39dbd90
parent3daa641d7f56109741ebe59416875a0162ac19a0
Merge branch 'master' into blender2.8
intern/ghost/intern/GHOST_WindowCocoa.mm
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/space_file/space_file.c