summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2021-05-27 18:46:00 +1000
committer Vas Crabb <vas@vastheman.com>2021-05-27 18:46:00 +1000
commit3820dfa4e44fbe8795e3aeec4bea783528786ecb (patch)
tree40b5b83430cf539734cb3c88c345c64d016fa296
parenta6523b5d9b6d6cdd1905eca52ab1df7fdfbd45f8 (diff)
parent2b0f01bc3aee493b3c05cf34c15af7cf5521210a (diff)
Merge tag 'mame0232' into mainline-master
MAME 0.232
-rw-r--r--android-project/app/src/main/AndroidManifest.xml4
-rw-r--r--makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
index b82fd81108f..999ea605d6b 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="231"
- android:versionName="0.231"
+ android:versionCode="232"
+ android:versionName="0.232"
android:installLocation="auto">
<!-- OpenGL ES 2.0 -->
diff --git a/makefile b/makefile
index ef72e17a158..1097656fafd 100644
--- a/makefile
+++ b/makefile
@@ -1760,14 +1760,14 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
- @echo '#define BARE_BUILD_VERSION "0.231"' > $@
+ @echo '#define BARE_BUILD_VERSION "0.232"' > $@
@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: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
- @echo #define BARE_BUILD_VERSION "0.231" > $@
+ @echo #define BARE_BUILD_VERSION "0.232" > $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@