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)
commit08da2826e0f29a6a43b60deb3b31dac8dba22e6d
tree351b3a5c748566aa07641882a443298a1fec2da5
parent230943be2d0bb8cc508f0938003597249a9ddebb
parent9812943931b06a078945820abff381dfe4a020cf
Merge branch 'master' into blender2.8
source/blender/editors/interface/interface.c
source/blender/windowmanager/intern/wm_keymap.c