Merge branch 'blender2.8' into userpref_redesign
authorJulian Eisel <eiseljulian@gmail.com>
Mon, 9 Apr 2018 09:22:38 +0000 (11:22 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Mon, 9 Apr 2018 09:22:38 +0000 (11:22 +0200)
1  2 
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/BKE_screen.h
source/blender/blenkernel/intern/screen.c
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_layout.c
source/blender/editors/screen/screen_ops.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_window.c

Simple merge