diff options
author | 2025-04-30 05:09:05 +1000 | |
---|---|---|
committer | 2025-04-30 05:09:05 +1000 | |
commit | 3131c646727a068ea81f8133c3e6be06b7d3bd42 (patch) | |
tree | 744a22f67df32c474dc45cde5526a83085adea71 | |
parent | b7c8cc8f400ddecd585620beaccc210e7b0d87a0 (diff) | |
parent | 84cb44566cbcee2d4bc657725be070e7d6820dd6 (diff) |
Merge tag 'mame0277' into HEAD
MAME 0.277
-rw-r--r-- | android-project/app/src/main/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | docs/source/conf.py | 4 | ||||
-rw-r--r-- | makefile | 4 |
3 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 c55e3218a60..2b1c5a540d7 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="276" - android:versionName="0.276" + android:versionCode="277" + android:versionName="0.277" android:installLocation="auto"> <!-- OpenGL ES 2.0 --> diff --git a/docs/source/conf.py b/docs/source/conf.py index ec88e24fcd9..dd4277f9919 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -63,9 +63,9 @@ copyright = u'1997-2025, MAMEdev and contributors' # built documents. # # The short X.Y version. -version = '0.276' +version = '0.277' # The full version, including alpha/beta/rc tags. -release = '0.276' +release = '0.277' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -1528,7 +1528,7 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.276"' > $@ + @echo '#define BARE_BUILD_VERSION "0.277"' > $@ @echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char bare_vcs_revision[];' >> $@ @@ -1538,7 +1538,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) @echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@ else $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo #define BARE_BUILD_VERSION "0.276" > $@ + @echo #define BARE_BUILD_VERSION "0.277" > $@ @echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char bare_vcs_revision[]; >> $@ |