Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 26 Jun 2017 23:57:40 +0000 (09:57 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 26 Jun 2017 23:59:36 +0000 (09:59 +1000)
commite6be5b8a2cdbfb9e62ef6bed83da841846cdfd1e
tree83311b2dce654f76858888ae640baf661d55210c
parent03b46f7941e17906b193db39f1ff4339b02b58c6
parentb796ce0f26c1bf206194eb8c004d214806c2828b
Merge branch 'master' into blender2.8
CMakeLists.txt
GNUmakefile
build_files/build_environment/install_deps.sh
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/library_remap.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/windowmanager/intern/wm_files_link.c