Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 23 Aug 2017 09:21:52 +0000 (19:21 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 23 Aug 2017 09:21:52 +0000 (19:21 +1000)
1  2 
source/blender/makesrna/intern/rna_wm.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_operators.c

Simple merge