git.blender.org - blender.git/commit

author	Campbell Barton <ideasman42@gmail.com>
	Thu, 2 Nov 2017 14:16:10 +0000 (01:16 +1100)
committer	Campbell Barton <ideasman42@gmail.com>
	Thu, 2 Nov 2017 14:16:10 +0000 (01:16 +1100)
commit	c1da6c9d7dd602c961fc5ada4e19266936357950
tree	60612831263da718ccf074b0552e8c775974df08	tree \| snapshot
parent	f7d59fbc460cd2e544c855d8088c98aacf90cfdd	commit \| diff
parent	25f2abf314d02df0896e7678a31434d7b895b3d9	commit \| diff

Merge branch 'master' into blender2.8

The official Blender Foundation tree

source/blender/editors/include/UI_interface.h	diff1 \|	diff2 \|	blob \| history
source/blender/editors/interface/interface_intern.h	diff1 \|	diff2 \|	blob \| history
source/blender/editors/interface/interface_layout.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/interface/interface_widgets.c	diff1 \|	diff2 \|	blob \| history