merged with master

This commit is contained in:
itsmattkc
2019-03-21 17:22:36 +11:00
46 changed files with 943 additions and 320 deletions
+1 -1
View File
@@ -82,7 +82,7 @@ TimecodeEffect::TimecodeEffect(Clip* c, const EffectMeta* em) :
offset_y_val = new DoubleField(offset_row, "offsety");
EffectRow* prepent_text_row = new EffectRow(this, tr("Prepend"));
prepend_text = new StringField(prepent_text_row, "prepend");
prepend_text = new StringField(prepent_text_row, "prepend", false);
prepend_text->SetColumnSpan(2);
}