Merge branch 'development' into LTS_development

# Conflicts: # src/input/input.cpp
2017-10-24 14:09:13 +02:00 · 2017-10-24 14:09:13 +02:00 · cac503f774
commit cac503f774
parent b1f1dc47ba a27cf083e6
7 changed files with 218 additions and 133 deletions
--- a/src/input/input.h
+++ b/src/input/input.h
@ -51,6 +51,7 @@ namespace Mist {
      virtual void convert();
      virtual void serve();
      virtual void stream();
+      virtual std::string streamMainLoop();
      bool isAlwaysOn();

      virtual void parseHeader();