Merge branch 'stable-1.2'

# Conflicts:
#	.travis/linux..before_install.sh
#	.travis/linux..install.sh
#	.travis/linux..script.sh
#	cmake/linux/package_linux.sh.in
#	include/AudioWeakJack.def
#	plugins/vst_base/CMakeLists.txt
#	plugins/zynaddsubfx/zynaddsubfx
This commit is contained in:
Hyunin Song committed 2017-12-20 14:16:16 +09:00
commit 59cfcf41a7
42 files changed
+847 -580

No files matched your search

+1 -1
View File
@@ -2,7 +2,7 @@
if [ "$QT5" ]; then
unset QTDIR QT_PLUGIN_PATH LD_LIBRARY_PATH
# shellcheck disable=SC1091
source /opt/qt58/bin/qt58-env.sh
source /opt/qt59/bin/qt59-env.sh
fi
set -e