Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts: # src/modelinfo/BaseModelInfo.cpp
2021-01-23 15:14:15 +02:00
parent cfac29b0ef b5c4866964
commit 904090cbb6
46 changed files with 155 additions and 144 deletions
--- a/src/audio/sampman.h
+++ b/src/audio/sampman.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "common.h"
 #include "AudioSamples.h"

 #define MAX_VOLUME 127