Merge remote-tracking branch 'origin/master' into feature/luaconsole

This commit is contained in:
Alexander Bock
2017-05-18 15:09:06 -04:00
+3
View File
@@ -31,6 +31,9 @@
#include <ghoul/misc/sharedmemory.h>
#include <ghoul/misc/onscopeexit.h>
#include <algorithm>
#include <cstring>
namespace {
const std::string _loggerCat = "PerformanceManager";