Merge remote-tracking branch 'upstram/master' into mueller_localPoolNeat

This commit is contained in:
muellerr committed 2020-05-20 14:38:41 +02:00
commit e576ddaa86
45 files changed
+229 -148

No files matched your search

+1 -1
View File
@@ -15,7 +15,7 @@ ReturnValue_t MemoryHelper::handleMemoryCommand(CommandMessage* message) {
lastSender = message->getSender();
lastCommand = message->getCommand();
if (busy) {
debug << "MemHelper: Busy!" << std::endl;
sif::debug << "MemHelper: Busy!" << std::endl;
}
switch (lastCommand) {
case MemoryMessage::CMD_MEMORY_DUMP: