merge with dev

This commit is contained in:
U-PC-BUREAU\jacques
2018-10-19 19:26:14 +02:00
198 changed files with 2052 additions and 1128 deletions

View File

@@ -282,8 +282,6 @@ Gtk::Widget* Preferences::getBatchProcPanel()
appendBehavList(mi, M("TP_VIBRANCE_PASTELS"), ADDSET_VIBRANCE_PASTELS, false);
appendBehavList(mi, M("TP_VIBRANCE_SATURATED"), ADDSET_VIBRANCE_SATURATED, false);
mi = behModel->append();
mi->set_value(behavColumns.label, M("TP_GAMMA_OUTPUT"));
mi = behModel->append();
mi->set_value(behavColumns.label, M("TP_CHMIXER_LABEL"));