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

2017-10-17 08:53:45 +02:00
parent da8029ba5e db6a386566
commit 6bde353f0b
219 changed files with 643 additions and 470 deletions
--- a/src/video/vid_cga.c
+++ b/src/video/vid_cga.c
@@ -8,7 +8,7 @@
 *
 *		Emulation of the old and new IBM CGA graphics cards.
 *
- * Version:	@(#)vid_cga.c	1.0.5	2017/10/13
+ * Version:	@(#)vid_cga.c	1.0.5	2017/10/16
 *
 * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
 *		Miran Grca, <mgrca8@gmail.com>
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <wchar.h>
 #include <math.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../io.h"
 #include "../mem.h"