mirror of
https://github.com/LMMS/lmms.git
synced 2026-02-24 10:17:59 -05:00
# Conflicts: # .travis.yml # .travis/linux..script.sh # .travis/linux.win.download.sh # .travis/linux.win32.script.sh # .travis/linux.win64.script.sh # .travis/osx..script.sh # include/VstSyncController.h # plugins/audio_file_processor/audio_file_processor.cpp # plugins/zynaddsubfx/zynaddsubfx # plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp # plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h # src/gui/SetupDialog.cpp # src/gui/editors/SongEditor.cpp