Merge branch 'development' into LTS_development

2018-11-28 11:55:15 +01:00 · 2018-11-28 11:55:15 +01:00 · 83665c4e3b
commit 83665c4e3b
parent 065f98e8e2 3cb03392e1
7 changed files with 34 additions and 7 deletions
--- a/lib/config.cpp
+++ b/lib/config.cpp
@ -37,6 +37,7 @@
 bool Util::Config::is_active = false;
 static Socket::Server * serv_sock_pointer = 0;
 unsigned int Util::Config::printDebugLevel = DEBUG;//
+std::string Util::Config::streamName;

 Util::Config::Config() {
  //global options here