Skip to content

Commit d45b43d

Browse files
committed
Undo commits incorrectly added in last merge
2 parents 26df526 + 5f1e56d commit d45b43d

File tree

17 files changed

+80
-83
lines changed

17 files changed

+80
-83
lines changed

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

Lines changed: 2 additions & 2 deletions
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="277"
8-
android:versionName="0.277"
7+
android:versionCode="276"
8+
android:versionName="0.276"
99
android:installLocation="auto">
1010

1111
<!-- OpenGL ES 2.0 -->

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
# built documents.
6464
#
6565
# The short X.Y version.
66-
version = '0.277'
66+
version = '0.276'
6767
# The full version, including alpha/beta/rc tags.
68-
release = '0.277'
68+
release = '0.276'
6969

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

hash/apple2_flop_clcracked.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37012,6 +37012,23 @@ license:CC0-1.0
3701237012
</part>
3701337013
</software>
3701437014

37015+
<software name="infinit">
37016+
<description>Infinitives (version 1988)</description>
37017+
<year>1988</year>
37018+
<publisher>Intellectual Software</publisher>
37019+
<info name="developer" value="Queue" />
37020+
<info name="usage" value="Requires a 48K Apple ][+ or later." />
37021+
<info name="version" value="1988" />
37022+
<sharedfeat name="compatibility" value="A2P,A2E,A2EE,A2C,A2GS" />
37023+
<!-- Dump released: 2024-11-27 -->
37024+
<!-- educational program -->
37025+
<part name="flop1" interface="floppy_5_25">
37026+
<dataarea name="flop" size="241419">
37027+
<rom name="infinitives 1988.woz" size="241419" crc="cab787e3" sha1="1b564c1b4fbc1841bc61c31a0dee7a37a9698e43" />
37028+
</dataarea>
37029+
</part>
37030+
</software>
37031+
3701537032
<software name="ioshapes">
3701637033
<description>Inside Outside Shapes (4am crack)</description>
3701737034
<year>1986</year>

hash/apple2_flop_orig.xml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23075,23 +23075,6 @@ license:CC0-1.0
2307523075
</part>
2307623076
</software>
2307723077

23078-
<software name="infinit">
23079-
<description>Infinitives (version 1988)</description>
23080-
<year>1988</year>
23081-
<publisher>Intellectual Software</publisher>
23082-
<info name="developer" value="Queue" />
23083-
<info name="usage" value="Requires a 48K Apple ][+ or later." />
23084-
<info name="version" value="1988" />
23085-
<sharedfeat name="compatibility" value="A2P,A2E,A2EE,A2C,A2GS" />
23086-
<!-- Dump released: 2024-11-27 -->
23087-
<!-- educational program -->
23088-
<part name="flop1" interface="floppy_5_25">
23089-
<dataarea name="flop" size="241419">
23090-
<rom name="infinitives 1988.woz" size="241419" crc="cab787e3" sha1="1b564c1b4fbc1841bc61c31a0dee7a37a9698e43" />
23091-
</dataarea>
23092-
</part>
23093-
</software>
23094-
2309523078
<software name="inthocky">
2309623079
<description>International Hockey</description>
2309723080
<year>1987</year>
@@ -29034,7 +29017,7 @@ license:CC0-1.0
2903429017
</software>
2903529018

2903629019
<software name="panzgrna10" cloneof="panzgrna">
29037-
<description>Panzer Grenadier (version 1.0)</description>
29020+
<description>Panzer Grenadier (verision 1.0)</description>
2903829021
<year>1985</year>
2903929022
<publisher>Strategic Simulations Inc. (SSI)</publisher>
2904029023
<info name="developer" value="LDW Software" />
@@ -29052,7 +29035,7 @@ license:CC0-1.0
2905229035
</software>
2905329036

2905429037
<software name="panzgrna">
29055-
<description>Panzer Grenadier (version 1.2)</description>
29038+
<description>Panzer Grenadier (verision 1.2)</description>
2905629039
<year>1985</year>
2905729040
<publisher>Strategic Simulations Inc. (SSI)</publisher>
2905829041
<info name="developer" value="LDW Software" />

hash/megadriv.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10067,7 +10067,7 @@ https://tcrf.net/World_Championship_Soccer_(Genesis)
1006710067
<info name="serial" value="T-119146-00" />
1006810068
<part name="cart" interface="megadriv_cart">
1006910069
<dataarea name="rom" width="16" endianness="big" size="2097152">
10070-
<rom name="7500-00030a.ic1" size="2097152" crc="23f603f5" sha1="d6d9733a619ba6be0dd76591d8dec621e4fdc17e" />
10070+
<rom name="7500-00030a.ic1 " size="2097152" crc="23f603f5" sha1="d6d9733a619ba6be0dd76591d8dec621e4fdc17e" />
1007110071
</dataarea>
1007210072
</part>
1007310073
</software>
@@ -10109,7 +10109,7 @@ https://tcrf.net/World_Championship_Soccer_(Genesis)
1010910109
<info name="serial" value="T-119146-00" />
1011010110
<part name="cart" interface="megadriv_cart">
1011110111
<dataarea name="rom" width="16" endianness="big" size="2097152">
10112-
<rom name="Zero Tolerance (Germany) (En).bin" size="2097152" crc="6fb49ff8" sha1="c2ea98f595cb477495a9d326ff25d91f3dbfa90b" />
10112+
<rom name="Zero Tolerance (Germany) (En).bin " size="2097152" crc="6fb49ff8" sha1="c2ea98f595cb477495a9d326ff25d91f3dbfa90b" />
1011310113
</dataarea>
1011410114
</part>
1011510115
</software>

hash/msx2_flop.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19209,7 +19209,7 @@ HOMEBREW
1920919209
<description>ASO Remake (UK?)</description>
1921019210
<year>2012</year>
1921119211
<publisher>&lt;homebrew&gt;</publisher>
19212-
<info name="developer" value="sharksym" />
19212+
<info name="developer" value="sharksym " />
1921319213
<part name="flop1" interface="floppy_3_5">
1921419214
<dataarea name="flop" size="737280">
1921519215
<rom name="aso_remake_20120205.dsk" size="737280" crc="63505503" sha1="01a2285990d33a927c266812097139a4a443b10d"/>

0 commit comments

Comments
 (0)