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

2018-04-28 13:48:49 +02:00
parent a4b7c1d067 ae26b835b6
commit 9426a9d633
82 changed files with 959 additions and 794 deletions
@@ -312,9 +312,10 @@ HEADERS  += \
    src/widgets/attachedwindow.hpp \
    src/widgets/settingspages/externaltoolspage.hpp \
    src/util/removescrollareabackground.hpp \
-    src/util/assertinguithread.h \
    src/util/standarditemhelper.hpp \
-    src/widgets/helper/comboboxitemdelegate.hpp
+    src/widgets/helper/comboboxitemdelegate.hpp \
+    src/util/assertinguithread.hpp \
+    src/util/signalvector2.hpp

 RESOURCES += \
    resources/resources.qrc