Merge tag 'mame0273' into HEAD

MAME 0.273
mamedev · Dec 31, 2024 · d985c98 · d985c98
2 parents ded3ddb + e11cae0
commit d985c98
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 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="272"
-      android:versionName="0.272"
+      android:versionCode="273"
+      android:versionName="0.273"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -63,9 +63,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.272'
+version = '0.273'
 # The full version, including alpha/beta/rc tags.
-release = '0.272'
+release = '0.273'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/source/initialsetup/compilingmame.rst b/docs/source/initialsetup/compilingmame.rst
@@ -184,9 +184,9 @@ configuration::
 Building with Microsoft Visual Studio
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-* You can generate Visual Studio 2019 projects using **make vs2019**.  The
+* You can generate Visual Studio 2022 projects using **make vs2022**.  The
   solution and project files will be created in
-  ``build/projects/windows/mame/vs2019`` by default (the name of the ``build``
+  ``build/projects/windows/mame/vs2022`` by default (the name of the ``build``
   folder can be changed using the ``BUILDDIR`` option).  This will always
   regenerate the settings, so **REGENIE=1** is *not* needed.
 * Adding **MSBUILD=1** to the make options will build the solution using
@@ -766,7 +766,7 @@ The MSVC compiler produces spurious warnings about potentially uninitialised
 local variables.  You currently need to add ``NOWERROR=1`` to the options passed
 to make when generating the Visual Studio project files.  This stops warnings
 from being treated as errors.  (MSVC seems to lack options to control which
-specific warnings are treated as error, which other compilers support.)
+specific warnings are treated as errors, which other compilers support.)
 
 
 .. _compiling-unusual:

diff --git a/hash/apple2_flop_misc.xml b/hash/apple2_flop_misc.xml
@@ -50,7 +50,7 @@ Generated by SLIST 0.2.1
 	</software>
 
 	<software name="a2diag31">
-		<description>Apple II Diagnostic Disk (version 3.1)(800K 3.5")</description>
+		<description>Apple II Diagnostic Disk (version 3.1) (800K 3.5")</description>
 		<year>1991</year>
 		<publisher>Apple Computer</publisher>
 		<info name="usage" value="Requires an Apple IIgs, IIc+, //c, //e with a compatible drive controller card." />

diff --git a/hash/ibm5170_cdrom.xml b/hash/ibm5170_cdrom.xml
@@ -8492,7 +8492,7 @@ Installation and Open Circulation CDs are bootable.
 	</software>
 
 	<software name="winnt40e" cloneof="winnt40">
-		<description>Windows NT Server, Enterpise Edition 4.0 (4.0.1381.4)</description>
+		<description>Windows NT Server, Enterprise Edition 4.0 (4.0.1381.4)</description>
 		<year>1997</year>
 		<publisher>Microsoft</publisher>
 		<notes><![CDATA[

diff --git a/makefile b/makefile
@@ -1578,7 +1578,7 @@ endif
 
 ifeq (posix,$(SHELLTYPE))
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo '#define BARE_BUILD_VERSION "0.272"' > $@
+	@echo '#define BARE_BUILD_VERSION "0.273"' > $@
 	@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
 	@echo 'extern const char bare_build_version[];' >> $@
 	@echo 'extern const char bare_vcs_revision[];' >> $@
@@ -1588,7 +1588,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.272" > $@
+	@echo #define BARE_BUILD_VERSION "0.273" > $@
 	@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
 	@echo extern const char bare_build_version[]; >> $@
 	@echo extern const char bare_vcs_revision[]; >> $@

diff --git a/src/mame/wing/luckgrln.cpp b/src/mame/wing/luckgrln.cpp
@@ -968,6 +968,6 @@ ROM_END
 **********************************************/
 
 //     YEAR  NAME      PARENT  MACHINE   INPUT     CLASS           INIT           ROT   COMPANY           FULL NAME                                 FLAGS                                     LAYOUT
-GAMEL( 1991, luckgrln, 0,      luckgrln, luckgrln, luckgrln_state, init_luckgrln, ROT0, "Wing Co., Ltd.", "Lucky Girl (newer Z180 based hardware)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_luckgrln )
-GAMEL( 1991, luckstrn, 0,      luckgrln, luckgrln, luckgrln_state, init_luckgrln, ROT0, "Wing Co., Ltd.", "Lucky Star (newer Z180 based hardware)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_luckgrln ) // missing internal ROM dump
+GAMEL( 1991, luckgrln, 0,      luckgrln, luckgrln, luckgrln_state, init_luckgrln, ROT0, "Wing Co., Ltd.", "Lucky Girl (newer Z180-based hardware)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_luckgrln )
+GAMEL( 1991, luckstrn, 0,      luckgrln, luckgrln, luckgrln_state, init_luckgrln, ROT0, "Wing Co., Ltd.", "Lucky Star (newer Z180-based hardware)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_luckgrln ) // missing internal ROM dump
 GAMEL( 1993, 7smash,   0,      _7smash,  _7smash,  luckgrln_state, empty_init,    ROT0, "Sovic",          "7 Smash",                                MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_7smash )