summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2020-03-04 10:45:54 -0500
committer GitHub <noreply@github.com>2020-03-04 10:45:54 -0500
commit7b118ea3e96f5ee44b8128dffa617b513ea796fb (patch)
tree7119b4e833215745b66291f402066ed0ee0067f6
parente3fc834460d3e899c363f18fef2b796504d050c5 (diff)
parent5dd66cb1f0856509cb73b33895d1434c9f0d1c6b (diff)
Merge pull request #6386 from FakeShemp/conflict
ibm5150.xml: Add Conflict
-rw-r--r--hash/ibm5150.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/hash/ibm5150.xml b/hash/ibm5150.xml
index 179ab445b22..17c52fbabf0 100644
--- a/hash/ibm5150.xml
+++ b/hash/ibm5150.xml
@@ -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>