Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

This commit is contained in:
Emil Axelsson
2017-12-17 18:30:00 +01:00
210 changed files with 5201 additions and 1299 deletions

View File

@@ -36,7 +36,7 @@
#include "moduleengine_lua.inl"
namespace {
const char* _loggerCat = "ModuleEngine";
constexpr const char* _loggerCat = "ModuleEngine";
} // namespace
namespace openspace {