Tobias Doerffel 7b8eaa6835 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

2014-03-24 19:37:26 +01:00

..

core

Merge remote-tracking branch 'origin/stable-0.4-undo-redo'

2014-03-24 19:37:26 +01:00

gui

Merge remote-tracking branch 'origin/stable-0.4-undo-redo'

2014-03-24 19:37:26 +01:00

tracks

Revert "Do not display ENV/LFO tab in plugin window if controls are disabled in it (SF2 Player and OpulenZ)"

2014-03-23 23:44:30 +01:00