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)
commit0661bcba3210be9714b1943935ba4cb7e6e04eec
tree41becb5df2300747c26f765634771a57175c2cd5
parentdf3e7d0361c6e151bc306e1ef71e006e955d1d39
parent111179beb0b12cfcc7075935262241c65f04fb84
Merge branch 'blender2.7'

Conflicts:
source/blender/windowmanager/intern/wm_operators.c
release/scripts/startup/bl_operators/wm.py