mirror of
https://github.com/LMMS/lmms.git
synced 2026-01-27 07:48:18 -05:00
Conflicts: .travis.yml CMakeLists.txt plugins/stk/mallets/mallets.cpp plugins/vst_base/CMakeLists.txt
Conflicts: .travis.yml CMakeLists.txt plugins/stk/mallets/mallets.cpp plugins/vst_base/CMakeLists.txt