Merge branch 'master' into development

This commit is contained in:
Peter Wu 2012-08-30 11:17:57 +02:00
commit 940fb7eb4c
2 changed files with 2 additions and 0 deletions

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){