ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from TASVideos/master 

Sync the code to the newest
This commit is contained in:
owomomo 2019-04-24 13:34:50 +08:00 committed by GitHub
parent c4b4292a12 0d26e6fcd9
commit cb5ff1bcea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/boards/datalatch.cpp
View File

@ -122,7 +122,6 @@ static void Latch_Init(CartInfo *info, void (*proc)(void), uint8 init, uint16 ad
}
AddExState(&latche, 1, 0, "LATC");
AddExState(&bus_conflict, 1, 0, "BUSC");
}
//------------------ Map 0 ---------------------------

2
src/drivers/win/debuggersp.h
View File

@ -20,7 +20,7 @@
#include <windows.h>
#define NL_MAX_NAME_LEN 30
#define NL_MAX_NAME_LEN 1000
#define NL_MAX_MULTILINE_COMMENT_LEN 1000
//mbg merge 7/17/06 made struct sane c++