Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Mar 2018 10:56:14 +0000 (11:56 +0100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Mar 2018 10:56:14 +0000 (11:56 +0100)
commitda00a50f7f48bfd95924705e69babea41f9d7b2b
tree099dd2761a77af893904098626119da0ae7bf18a
parent2ee4e9761f6ab2c32e8e90c7317f5e7310a8e532
parent529c21acc2e6e0830844a610d4f8d6a9b72a9902
Merge branch 'master' into blender2.8
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c
source/blender/windowmanager/wm.h
source/blender/windowmanager/wm_window.h