Merge branch 'master' of https://github.com/fourtf/chatterino2

2018-01-28 03:39:47 +01:00
parent 591ab4d8da e518cff06e
commit 431b9a8c1f
76 changed files with 1645 additions and 561 deletions
@@ -64,6 +64,6 @@ private:
    // std::shared_ptr<logging::Channel> loggingChannel;
 };

-typedef std::shared_ptr<Channel> SharedChannel;
+typedef std::shared_ptr<Channel> ChannelPtr;

 }  // namespace chatterino