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)
1  2 
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

diff --cc CMakeLists.txt
Simple merge
diff --cc GNUmakefile
Simple merge
index cab67e68e0ee129ec3db1a5341e165a8c5a7b385,3852b4fe7057d103b8205a5b0a0288783cb6ab10..ad9ef3f8594ceb9d3f2ee173276698b429dd0936
@@@ -25,8 -25,8 +25,8 @@@
  ARGS=$( \
  getopt \
  -o s:i:t:h \
 ---long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,use-cxx11,\
 +--long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,\
- with-all,with-opencollada,\
+ with-all,with-opencollada,with-jack,\
  ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,\
  force-all,force-python,force-numpy,force-boost,\
  force-ocio,force-openexr,force-oiio,force-llvm,force-osl,force-osd,force-openvdb,\