Skip to content

Commit 089633f

Browse files
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # makefile # scripts/build/verinfo.py
2 parents 13fef1c + 09e4b34 commit 089633f

File tree

130 files changed

+6847
-6449
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+6847
-6449
lines changed

COPYING

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ distributions.
1111

1212

1313
MAME
14-
Copyright (c) 1997-2022 MAMEdev and contributors
14+
Copyright (c) 1997-2023 MAMEdev and contributors
1515

1616
This program is free software; you can redistribute it and/or modify it
1717
under the terms of the GNU General Public License version 2, as provided

android-project/app/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
-->
55
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
66
package="org.mamedev.mame"
7-
android:versionCode="250"
8-
android:versionName="0.250"
7+
android:versionCode="251"
8+
android:versionName="0.251"
99
android:installLocation="auto">
1010

1111
<!-- OpenGL ES 2.0 -->

docs/source/conf.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@
5656

5757
# General information about the project.
5858
project = u'MAME Documentation'
59-
copyright = u'1997-2022, MAMEdev and contributors'
59+
copyright = u'1997-2023, MAMEdev and contributors'
6060

6161
# The version info for the project you're documenting, acts as replacement for
6262
# |version| and |release|, also used in various other places throughout the
6363
# built documents.
6464
#
6565
# The short X.Y version.
66-
version = '0.250'
66+
version = '0.251'
6767
# The full version, including alpha/beta/rc tags.
68-
release = '0.250'
68+
release = '0.251'
6969

7070
# The language for content autogenerated by Sphinx. Refer to documentation
7171
# for a list of supported languages.

docs/source/license.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ would encourage new contributors to distribute files under this license.
1212
Please note that MAME is a registered trademark of Gregory Ember, and permission
1313
is required to use the “MAME” name, logo, or wordmark.
1414

15-
Copyright (C) 1997-2022 MAMEDev and contributors
15+
Copyright (C) 1997-2023 MAMEDev and contributors
1616

1717
This program is free software; you can redistribute it and/or modify
1818
it under the terms of the GNU General Public License as published by

docs/source/whatis.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ that were its initial focus.
1919

2020
|
2121
| **MAME®**
22-
| **Copyright © 1997-2022 Nicola Salmoria and the MAME team**
22+
| **Copyright © 1997-2023 MAMEdev and contributors**
2323
| **MAME is a registered trademark of Gregory Ember**
2424
|
2525

hash/chessking_cart.xml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
3+
<!--
4+
license:CC0-1.0
5+
-->
6+
<softwarelist name="chessking_cart" description="Chess King cartridges">
7+
8+
<software name="chn_dic">
9+
<description>English-Chinese Dictionary</description>
10+
<year>1994</year>
11+
<publisher>I-Star Co., Ltd.</publisher>
12+
<part name="cart" interface="chessking_cart">
13+
<dataarea name="rom" size="0x200000">
14+
<rom name="et-mate_chn-dic.u1" size="0x200000" crc="9de03037" sha1="6b7d399c98ffbb6c633cbc5e18e1d6ed0a05b06e" />
15+
</dataarea>
16+
</part>
17+
</software>
18+
19+
</softwarelist>

0 commit comments

Comments
 (0)