Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	makefile
#	scripts/build/verinfo.py

Author: Robbbert

COPYING

@@ -11,7 +11,7 @@ distributions.
 
 
 MAME
-Copyright (c) 1997-2022 MAMEdev and contributors
+Copyright (c) 1997-2023 MAMEdev and contributors
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License version 2, as provided

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="250"
-      android:versionName="0.250"
+      android:versionCode="251"
+      android:versionName="0.251"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->

docs/source/conf.py

@@ -56,16 +56,16 @@
 
 # General information about the project.
 project = u'MAME Documentation'
-copyright = u'1997-2022, MAMEdev and contributors'
+copyright = u'1997-2023, MAMEdev and contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.250'
+version = '0.251'
 # The full version, including alpha/beta/rc tags.
-release = '0.250'
+release = '0.251'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/license.rst

@@ -12,7 +12,7 @@ would encourage new contributors to distribute files under this license.
 Please note that MAME is a registered trademark of Gregory Ember, and permission
 is required to use the “MAME” name, logo, or wordmark.
 
-    Copyright (C) 1997-2022  MAMEDev and contributors
+    Copyright (C) 1997-2023  MAMEDev and contributors
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

docs/source/whatis.rst

@@ -19,7 +19,7 @@ that were its initial focus.
 
 |
 | **MAME®**
-| **Copyright © 1997-2022 Nicola Salmoria and the MAME team**
+| **Copyright © 1997-2023 MAMEdev and contributors**
 | **MAME is a registered trademark of Gregory Ember**
 |
 

hash/chessking_cart.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<!--
+license:CC0-1.0
+-->
+<softwarelist name="chessking_cart" description="Chess King cartridges">
+
+	<software name="chn_dic">
+		<description>English-Chinese Dictionary</description>
+		<year>1994</year>
+		<publisher>I-Star Co., Ltd.</publisher>
+		<part name="cart" interface="chessking_cart">
+			<dataarea name="rom" size="0x200000">
+				<rom name="et-mate_chn-dic.u1" size="0x200000" crc="9de03037" sha1="6b7d399c98ffbb6c633cbc5e18e1d6ed0a05b06e" />
+			</dataarea>
+		</part>
+	</software>
+
+</softwarelist>