Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 18 Jul 2017 08:10:19 +0000 (18:10 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 18 Jul 2017 08:10:19 +0000 (18:10 +1000)
1  2 
source/blender/editors/animation/anim_markers.c
source/blender/editors/space_view3d/view3d_walk.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_event_system.c

Simple merge