Merge pull request #6386 from FakeShemp/conflict

ibm5150.xml: Add Conflict
This commit is contained in:
R. Belmont 2020-03-04 10:45:54 -05:00 committed by GitHub
commit 7b118ea3e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -488,7 +488,7 @@ Known PC Booter Games Not Dumped, Or Dumped and Lost when Demonlord's Site went
</part>
</software>
<software name="conflict">
<software name="cnflctvn">
<description>Conflict in Vietnam</description>
<year>1986</year>
<publisher>MicroProse</publisher>
@ -8102,6 +8102,17 @@ has been replaced with an all-zero block. -->
</part>
</software>
<software name="conflict">
<description>Conflict</description>
<year>1990</year>
<publisher>16 Blitz</publisher>
<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size = "2152124">
<rom name="conflict.mfm" size="2152124" crc="b43b9afc" sha1="8cf07476ea3ac53448043d67294e0ec1adb48ecd"/>
</dataarea>
</part>
</software>
<software name="crimewav">
<description>Crime Wave</description>
<year>1990</year>