Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 10 Aug 2017 13:57:59 +0000 (15:57 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 10 Aug 2017 13:57:59 +0000 (15:57 +0200)
commit4a4c6da0f8aaf94dff8d219770404c46760cce15
treeca7213d9957a1ce0ee4811e0deadfde2e42e18e9
parent6e2f17ea02be5caa9eee8a68ccd558474030b29a
parentaa1b35bb60d1d559f00095ed895a0c1884193a39
Merge branch 'master' into blender2.8
GNUmakefile
build_files/build_environment/install_deps.sh
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_window.c