diff options
author | 2017-06-28 12:07:02 +1000 | |
---|---|---|
committer | 2017-06-28 12:07:02 +1000 | |
commit | c05cf76d0ff2a0ab794ab992d7f1519981757ceb (patch) | |
tree | 2d3d37ae34e63f0aa0d65c12a2eb335f20374233 /src | |
parent | 372fb33a15e95ef6b6a55b61de9818d78ca2e99b (diff) | |
parent | 1d9648b01c840b65622b5bfd1fdc16297f95d424 (diff) |
Merge tag 'mame0187'
MAME 0.187
Conflicts:
src/mame/drivers/socrates.cpp
Diffstat (limited to 'src')
-rw-r--r-- | src/mame/drivers/socrates.cpp | 2 | ||||
-rw-r--r-- | src/tools/unidasm.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mame/drivers/socrates.cpp b/src/mame/drivers/socrates.cpp index 6780f5a2b94..7e5f5b97f55 100644 --- a/src/mame/drivers/socrates.cpp +++ b/src/mame/drivers/socrates.cpp @@ -80,9 +80,9 @@ TODO: ******************************************************************************/ -/* Core includes */ #include "emu.h" #include "audio/socrates.h" + #include "cpu/z80/z80.h" #include "bus/generic/carts.h" diff --git a/src/tools/unidasm.cpp b/src/tools/unidasm.cpp index aba4a66226f..6ea7939af2c 100644 --- a/src/tools/unidasm.cpp +++ b/src/tools/unidasm.cpp @@ -274,7 +274,7 @@ static const dasm_table_entry dasm_table[] = // { "h8", _16be, 0, CPU_DISASSEMBLE_NAME(h8) }, // { "h8_24", _16be, 0, CPU_DISASSEMBLE_NAME(h8_24) }, // { "h8_32", _16be, 0, CPU_DISASSEMBLE_NAME(h8_32) }, - { "hc11", _8bit, 0, CPU_DISASSEMBLE_NAME(mb88) }, + { "hc11", _8bit, 0, CPU_DISASSEMBLE_NAME(hc11) }, { "hcd62121", _8bit, 0, CPU_DISASSEMBLE_NAME(hcd62121) }, { "hd61700", _8bit, 0, CPU_DISASSEMBLE_NAME(hd61700) }, { "hd6301", _8bit, 0, CPU_DISASSEMBLE_NAME(hd6301) }, |