Merge tag 'mame0234' into rel234

MAME 0.234
mahlemiut · Jul 28, 2021 · 69f0aa9 · 69f0aa9
2 parents 5586925 + 2633c19
commit 69f0aa9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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="233"
-      android:versionName="0.233"
+      android:versionCode="234"
+      android:versionName="0.234"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->

diff --git 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.233"' > $@
+	@echo '#define BARE_BUILD_VERSION "0.234"' > $@
 	@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 "W ($(NEW_GIT_VERSION))";' >> $@
 else
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo #define BARE_BUILD_VERSION "0.233" > $@
+	@echo #define BARE_BUILD_VERSION "0.234" > $@
 	@echo extern const char bare_build_version[]; >> $@
 	@echo extern const char build_version[]; >> $@
 	@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@