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

2018-01-28 17:53:16 +01:00
parent 643486da14 a104e92ad5
commit 74fec12848
5 changed files with 8 additions and 2 deletions
@@ -52,6 +52,7 @@ public:
    FloatSetting mouseScrollMultiplier = {"/behaviour/mouseScrollMultiplier", 1.0};
    QStringSetting streamlinkPath = {"/behaviour/streamlink/path", ""};
    QStringSetting preferredQuality = {"/behaviour/streamlink/quality", "Choose"};
+    QStringSetting streamlinkOpts = {"/behaviour/streamlink/options", ""};
    BoolSetting pauseChatHover = {"/behaviour/pauseChatHover", false};

    /// Commands