summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--android-project/app/src/main/AndroidManifest.xml4
-rw-r--r--makefile4
-rw-r--r--src/mame/drivers/socrates.cpp2
-rw-r--r--src/tools/unidasm.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
index e01d3befbf9..694ee65c052 100644
--- a/android-project/app/src/main/AndroidManifest.xml
+++ b/android-project/app/src/main/AndroidManifest.xml
@@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
- android:versionCode="186"
- android:versionName="0.186"
+ android:versionCode="187"
+ android:versionName="0.187"
android:installLocation="auto">
<!-- Android 5.0 -->
diff --git a/makefile b/makefile
index b9d4a249824..9a3356a83bc 100644
--- a/makefile
+++ b/makefile
@@ -1546,14 +1546,14 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS)
- @echo '#define BARE_BUILD_VERSION "0.186"' > $@
+ @echo '#define BARE_BUILD_VERSION "0.187"' > $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char build_version[];' >> $@
@echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@
@echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@
else
$(GENDIR)/version.cpp: $(GENDIR)/git_desc
- @echo #define BARE_BUILD_VERSION "0.186" > $@
+ @echo #define BARE_BUILD_VERSION "0.187" > $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@
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) },