hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into FTP

Browse source
This commit is contained in:
Erik Zandvliet 2012-08-29 11:40:52 +02:00
commit 0687a6a971
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/config.cpp
View file

@ -23,6 +23,7 @@
#include <fstream>
bool Util::Config::is_active = false;
std::string Util::Config::libver = PACKAGE_VERSION;
/// Creates a new configuration manager.
Util::Config::Config(std::string cmd, std::string version){

1
lib/config.h
View file

@ -16,6 +16,7 @@ namespace Util{
static void signal_handler(int signum);
public:
//variables
static std::string libver; ///< Version number of the library as a string.
static bool is_active; ///< Set to true by activate(), set to false by the signal handler.
//functions
Config(std::string cmd, std::string version);