Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 7 Jul 2018 09:32:40 +0000 (11:32 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 7 Jul 2018 09:32:40 +0000 (11:32 +0200)
commit1f539cd7efbc0589f365bf3b1d21774e6e126ef4
tree441bc47014f1ef32406578749c3c55c38ba2cf14
parent0f1000ce0b296c1a6e4de3534dd3f3b51926167c
parent97cd8bfae19666554db17c42b3d2a7cfa16498f8
Merge branch 'master' into blender2.8
release/scripts/modules/bpy_extras/keyconfig_utils.py