mirror of
https://github.com/LMMS/lmms.git
synced 2026-01-28 16:23:12 -05:00
Conflicts: include/AutomatableModel.h include/MidiPort.h include/TrackContainerView.h include/surround_area.h include/track.h src/core/AutomatableModel.cpp src/core/TrackContainer.cpp src/core/note.cpp src/core/track.cpp src/gui/PianoRoll.cpp src/gui/TrackContainerView.cpp src/gui/widgets/LcdSpinBox.cpp