Merge remote-tracking branch 'origin/stable-0.4-undo-redo'
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
This commit is contained in:
@@ -25,6 +25,7 @@
|
||||
#ifndef _VST_PLUGIN_H
|
||||
#define _VST_PLUGIN_H
|
||||
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QMutex>
|
||||
#include <QtCore/QPointer>
|
||||
#include <QtCore/QString>
|
||||
|
||||
Reference in New Issue
Block a user