diff options
| author | 2025-08-31 06:54:00 +1000 | |
|---|---|---|
| committer | 2025-08-31 06:54:00 +1000 | |
| commit | 5ad79a46c44c5fa2efa73d57e2396fc5ace04ae5 (patch) | |
| tree | fc93c14b2bd7d7c9b9d597c39c734c6e22cc8f41 | |
| parent | 78e5dd0bb17735ab8d050b99426c1182c0fc1186 (diff) | |
| parent | ec9abd86c6c9029f67e9cf4908ef5426b78d3eab (diff) | |
Merge tag 'mame0280' into HEAD
MAME 0.280
| -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 81d460276ee..0f7ea532e57 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="279" - android:versionName="0.279" + android:versionCode="280" + android:versionName="0.280" android:installLocation="auto"> <!-- OpenGL ES 2.0 --> diff --git a/docs/source/conf.py b/docs/source/conf.py index e3177c95298..fad41753088 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.279' +version = '0.280' # The full version, including alpha/beta/rc tags. -release = '0.279' +release = '0.280' # 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.279"' > $@ + @echo '#define BARE_BUILD_VERSION "0.280"' > $@ @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.279" > $@ + @echo #define BARE_BUILD_VERSION "0.280" > $@ @echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char bare_vcs_revision[]; >> $@ |
