# Conflicts: # .gitmodules # .travis/linux..install.sh # CMakeLists.txt # plugins/vst_base/CMakeLists.txt # src/3rdparty/CMakeLists.txt
# Conflicts: # .gitmodules # .travis/linux..install.sh # CMakeLists.txt # plugins/vst_base/CMakeLists.txt # src/3rdparty/CMakeLists.txt