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
2017-12-20 14:08:07 +09:00
parent 6aeba4fd13 eb9b460925
commit 59cfcf41a7
42 changed files with 847 additions and 580 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ matrix:
        - env: TARGET_OS=win64
        - os: osx
          osx_image: xcode8.2
+        - env: QT5=
        - env: QT5=True
        - env: QT5=True TARGET_OS=win32
        - env: QT5=True TARGET_OS=win64