Merge branch 'master' of https://github.com/Confuseh/chatterino2 into Confuseh-master

This commit is contained in:
fourtf
2018-01-28 17:53:16 +01:00
5 changed files with 8 additions and 2 deletions
@@ -45,6 +45,7 @@ BehaviourPage::BehaviourPage()
groupLayout->addRow("Streamlink path:", this->createLineEdit(settings.streamlinkPath));
groupLayout->addRow("Prefered quality:",
this->createComboBox({STREAMLINK_QUALITY}, settings.preferredQuality));
groupLayout->addRow("Additional options:", this->createLineEdit(settings.streamlinkOpts));
}
layout->addStretch(1);