Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 25 May 2018 08:52:53 +0000 (10:52 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 25 May 2018 08:52:53 +0000 (10:52 +0200)
1  2 
source/blender/editors/interface/interface.c
source/blender/windowmanager/intern/wm_keymap.c