Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 7 Jun 2018 14:45:10 +0000 (16:45 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 7 Jun 2018 14:45:34 +0000 (16:45 +0200)
commitf0815b1322dc4f04dd949fd92049a99479e5f61d
tree9388af5e754d416e3f9fac95a2cbc67e57531e9f
parentfcc5d7c29e02eae1429009cc02eb9c75d159f245
parent863e395ad8bc0c921a9c836018e2c17262340f46
Merge branch 'master' into blender2.8
18 files changed:
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/WM_keymap.h
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm.c
source/blender/windowmanager/intern/wm_cursors.c
source/blender/windowmanager/intern/wm_dragdrop.c
source/blender/windowmanager/intern/wm_draw.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_files_link.c
source/blender/windowmanager/intern/wm_gesture.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_keymap.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_playanim.c
source/blender/windowmanager/intern/wm_window.c
source/blender/windowmanager/wm.h
source/blender/windowmanager/wm_event_types.h