Merge branch 'master' into rename
Conflicts: src/core/Song.cpp src/gui/LfoControllerDialog.cpp src/tracks/InstrumentTrack.cpp
This commit is contained in:
commit
5f4cdac802
59 files changed
+372
-203
No files matched your search
@@ -67,3 +67,4 @@ AmplifierControlDialog::AmplifierControlDialog( AmplifierControls* controls ) :
|
||||
rightKnob->setLabel( tr( "RIGHT" ) );
|
||||
rightKnob->setHintText( tr( "Right gain:" ) + " ", "%" );
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user