Merge branch 'blender2.7'
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 27 Dec 2018 22:33:42 +0000 (23:33 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 27 Dec 2018 22:33:42 +0000 (23:33 +0100)
Conflicts:
source/blender/windowmanager/intern/wm_operators.c

1  2 
release/scripts/startup/bl_operators/wm.py