diff options
author | Vas Crabb <vas@vastheman.com> | 2022-08-31 15:46:38 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2022-08-31 15:46:38 +1000 |
commit | 35d2b1d33bc7fc526ea3d17a6c0d84da4a773c8b (patch) | |
tree | 764865b420ed34c18c6a33872fed5ad6fe21e773 | |
parent | 0f6d486cd329cba43da0f0f06f1bafa64f2e32f6 (diff) | |
parent | fa2d36c6347265a2f048d44f29e17abd2c8d1f87 (diff) |
Merge tag 'mame0247' into mainline-master
MAME 0.247
-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 c67bbc5ad9a..16879df99a7 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="246" - android:versionName="0.246" + android:versionCode="247" + android:versionName="0.247" android:installLocation="auto"> <!-- OpenGL ES 2.0 --> diff --git a/docs/source/conf.py b/docs/source/conf.py index a98dc13fb32..a90bc66c54f 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -63,9 +63,9 @@ copyright = u'1997-2022, MAMEdev and contributors' # built documents. # # The short X.Y version. -version = '0.246' +version = '0.247' # The full version, including alpha/beta/rc tags. -release = '0.246' +release = '0.247' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -1579,7 +1579,7 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.246"' > $@ + @echo '#define BARE_BUILD_VERSION "0.247"' > $@ @echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char bare_vcs_revision[];' >> $@ @@ -1589,7 +1589,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.246" > $@ + @echo #define BARE_BUILD_VERSION "0.247" > $@ @echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char bare_vcs_revision[]; >> $@ |