Merge branch 'master' of https://github.com/86Box/86Box

2020-06-26 18:05:57 -03:00
parent 5115214d01 332dfd9743
commit 93b909fe59
51 changed files with 1867 additions and 299 deletions
--- a/src/mem/spd.c
+++ b/src/mem/spd.c
@@ -25,6 +25,7 @@
 #include <86box/device.h>
 #include <86box/smbus.h>
 #include <86box/spd.h>
+#include <86box/version.h>


 #define MIN(a, b)	((a) < (b) ? (a) : (b))