[Bf-blender-cvs] [0661bcba321] master: Merge branch 'blender2.7'

[Bastien Montagne]

Commit: 0661bcba3210be9714b1943935ba4cb7e6e04eec
Author: Bastien Montagne
Date:   Thu Dec 27 23:33:42 2018 +0100
Branches: master
https://developer.blender.org/rB0661bcba3210be9714b1943935ba4cb7e6e04eec

Merge branch 'blender2.7'

Conflicts:
	source/blender/windowmanager/intern/wm_operators.c

===================================================================



===================================================================