From: Elena Mamontova <helenh463@gmail.com>
Date: Thu, 17 Mar 2016 07:39:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/stg-2.409' into ticket26
X-Git-Tag: 2.409~174^2~1^2~9
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/8c7e6453aff765245cc5c28f37543f13d92dbe74?hp=--cc

Merge remote-tracking branch 'origin/stg-2.409' into ticket26
---

8c7e6453aff765245cc5c28f37543f13d92dbe74
diff --cc projects/stargazer/plugin_mgr.h
index 0330f4e8,c9ec8dff..a37052d5
--- a/projects/stargazer/plugin_mgr.h
+++ b/projects/stargazer/plugin_mgr.h
@@@ -48,7 -48,8 +48,8 @@@ class PluginManage
                        USERS_IMPL& users, TRAFFCOUNTER_IMPL& traffcounter);
          ~PluginManager();
  
 -        void reload();
 +        void reload(const SETTINGS_IMPL& settings);
+         void stop();
  
      private:
          std::vector<PLUGIN_RUNNER*> m_modules;