mirror of
https://github.com/LMMS/lmms.git
synced 2026-03-19 22:48:46 -04: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