diff options
author | 2022-04-29 17:17:32 +1000 | |
---|---|---|
committer | 2022-04-29 17:17:32 +1000 | |
commit | 1acbb5c377976aa8bda08435ac1028195232f024 (patch) | |
tree | 129a409f836b343ea93a1e740a28949acdd79a85 | |
parent | 3e9bcb45a6393559ec5c13de15a449c8857bb295 (diff) | |
parent | addbb8ab40b4f0e780a6937a8788c8bb6bbcb3da (diff) |
Merge tag 'mame0243' into HEAD
MAME 0.243
-rw-r--r-- | android-project/app/src/main/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | docs/source/conf.py | 4 | ||||
-rw-r--r-- | hash/apple2_flop_orig.xml | 16 | ||||
-rw-r--r-- | makefile | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 5066ba30bc8..eb629b8307f 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="242" - android:versionName="0.242" + android:versionCode="243" + android:versionName="0.243" android:installLocation="auto"> <!-- OpenGL ES 2.0 --> diff --git a/docs/source/conf.py b/docs/source/conf.py index 6be8a143e39..e8277abefe4 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.242' +version = '0.243' # The full version, including alpha/beta/rc tags. -release = '0.242' +release = '0.243' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/hash/apple2_flop_orig.xml b/hash/apple2_flop_orig.xml index d871b1b2f61..0d983610e8f 100644 --- a/hash/apple2_flop_orig.xml +++ b/hash/apple2_flop_orig.xml @@ -21734,7 +21734,7 @@ license:CC0 </software> <software name="lsmith50c"> - <description>Locksmith (Version 5.0 Revision C) </description> + <description>Locksmith (Version 5.0 Revision C)</description> <year>1983</year> <publisher>Omega Microware</publisher> <info name="release" value="2022-03-26"/> @@ -21750,7 +21750,7 @@ license:CC0 </software> <software name="lsmith50f"> - <description>Locksmith (Version 5.0 Revision F) </description> + <description>Locksmith (Version 5.0 Revision F)</description> <year>1983</year> <publisher>Omega Microware</publisher> <info name="release" value="2022-03-26"/> @@ -21766,7 +21766,7 @@ license:CC0 </software> <software name="lsmith50g"> - <description>Locksmith (Version 5.0 Revision G) </description> + <description>Locksmith (Version 5.0 Revision G)</description> <year>1983</year> <publisher>Omega Microware</publisher> <info name="release" value="2022-03-26"/> @@ -21782,7 +21782,7 @@ license:CC0 </software> <software name="lsmith60a"> - <description>Locksmith (Version 6.0 Revision A) </description> + <description>Locksmith (Version 6.0 Revision A)</description> <year>1986</year> <publisher>Alpha Logic Business Systems</publisher> <info name="release" value="2022-03-26"/> @@ -21820,7 +21820,7 @@ license:CC0 </software> <software name="lsmith60b"> - <description>Locksmith (Version 6.0 Revision B) </description> + <description>Locksmith (Version 6.0 Revision B)</description> <year>1986</year> <publisher>Alpha Logic Business Systems</publisher> <info name="release" value="2022-03-27"/> @@ -21956,7 +21956,7 @@ license:CC0 </software> <software name="copy2pv44b"> - <description>Copy II Plus (Version 4.4B) </description> + <description>Copy II Plus (Version 4.4B)</description> <year>1982</year> <publisher>Central Point Software</publisher> <info name="release" value="2022-03-28"/> @@ -21972,7 +21972,7 @@ license:CC0 </software> <software name="copy2pv44c"> - <description>Copy II Plus (Version 4.4C) </description> + <description>Copy II Plus (Version 4.4C)</description> <year>1982</year> <publisher>Central Point Software</publisher> <info name="release" value="2022-03-28"/> @@ -22004,7 +22004,7 @@ license:CC0 </software> <software name="copy2pv44d"> - <description>Copy II Plus (Version 4.4D) </description> + <description>Copy II Plus (Version 4.4D)</description> <year>1982</year> <publisher>Central Point Software</publisher> <info name="release" value="2022-03-28"/> @@ -1546,7 +1546,7 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.242"' > $@ + @echo '#define BARE_BUILD_VERSION "0.243"' > $@ @echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char bare_vcs_revision[];' >> $@ @@ -1556,7 +1556,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.242" > $@ + @echo #define BARE_BUILD_VERSION "0.243" > $@ @echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char bare_vcs_revision[]; >> $@ |