Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 2 Sep 2018 09:42:29 +0000 (19:42 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 2 Sep 2018 09:45:56 +0000 (19:45 +1000)
commit3cba77f16b80738499142d8c774b0b08dec160e5
tree786aa2c8eb7058fc328b7fcc02a236cb0974f09e
parent127603f70ee36c790d21457e78a77263291ae610
parent4bb8dba340e0ac570f4a4eb628d0be09c92713b7
Merge branch 'master' into blender2.8
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/WM_keymap.h
source/blender/windowmanager/intern/wm_keymap.c
source/blender/windowmanager/intern/wm_keymap_utils.c