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

2017-05-07 23:52:47 -04:00
parent 5a87f91bc5 adfbf25391
commit 0eed79510e
28 changed files with 590 additions and 1212 deletions
--- a/src/ibm.h
+++ b/src/ibm.h
@@ -662,8 +662,6 @@ uint64_t timer_read();
 extern uint64_t timer_freq;


-void loadconfig(wchar_t *fn);
-
 extern int infocus;

 void onesec();