Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 17 Oct 2017 04:18:12 +0000 (15:18 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 17 Oct 2017 04:18:12 +0000 (15:18 +1100)
1  2 
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/wm.h

Simple merge
Simple merge