git.blender.org - blender.git/commit

projects / blender.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3f5f4f0 e815784)

author	Julian Eisel <eiseljulian@gmail.com>
	Thu, 22 Nov 2018 18:06:52 +0000 (19:06 +0100)
committer	Julian Eisel <eiseljulian@gmail.com>
	Thu, 22 Nov 2018 18:06:52 +0000 (19:06 +0100)
commit	6a7e974a936c2cc363c519b0bf0d97d1f32e825c
tree	83e84cb0d01215ce2825459b01d14bb1e00667d3	tree \| snapshot
parent	3f5f4f089dd4b05a65c10d5b224cb7ebabe32f11	commit \| diff
parent	e815784aa684ccd66a491bbf27370b91ce14f397	commit \| diff

Merge branch 'blender2.8' into userpref_redesign

17 files changed:

release/scripts/addons	diff1 \|	diff2 \|	blob \| history
release/scripts/addons_contrib	diff1 \|	diff2 \|	blob \| history
release/scripts/startup/bl_ui/space_info.py	diff1 \|	diff2 \|	blob \| history
release/scripts/startup/bl_ui/space_topbar.py	\|	diff2 \|	blob \| history
release/scripts/startup/bl_ui/space_userpref.py	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/BKE_screen.h	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/screen.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenloader/intern/versioning_280.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/include/UI_interface.h	diff1 \|	diff2 \|	blob \| history
source/blender/editors/interface/interface_layout.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/screen/screen_ops.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_userpref/space_userpref.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_userdef_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_userdef.c	diff1 \|	diff2 \|	blob \| history
source/blender/windowmanager/WM_api.h	diff1 \|	diff2 \|	blob \| history
source/blender/windowmanager/intern/wm_window.c	diff1 \|	diff2 \|	blob \| history
source/tools	diff1 \|	diff2 \|	blob \| history

The official Blender Foundation tree