Merge branch 'stable-1.2'

# Conflicts:
#	.travis/linux..before_install.sh
#	.travis/linux..install.sh
#	cmake/linux/lmms.desktop
#	plugins/vst_base/CMakeLists.txt
This commit is contained in:
Lukas W committed 2017-10-18 17:33:55 +02:00
commit 1059c92d87
37 files changed
+2514 -57

No files matched your search

+4
View File
@@ -1,4 +1,8 @@
#!/usr/bin/env bash
if [ $QT5 ]; then
unset QTDIR QT_PLUGIN_PATH LD_LIBRARY_PATH
source /opt/qt58/bin/qt58-env.sh
fi
set -e