summaryrefslogtreecommitdiffstatshomepage
path: root/hash/gameboy.xml
diff options
context:
space:
mode:
author sparrowred <redsparrow@freenet.de>2016-12-23 14:49:39 +0100
committer sparrowred <redsparrow@freenet.de>2016-12-23 14:49:39 +0100
commit3cd0e74eb48575889d3219c2192b1ea3da53f0b0 (patch)
tree83cbf84083ec6357b87cc875ea9109d5739ade36 /hash/gameboy.xml
parentd0b0de1aec45c0f9b66c931efb9902874cb93728 (diff)
reverted last change (nw)
Diffstat (limited to 'hash/gameboy.xml')
-rw-r--r--hash/gameboy.xml20
1 files changed, 2 insertions, 18 deletions
diff --git a/hash/gameboy.xml b/hash/gameboy.xml
index 5490e11d631..796fdc95465 100644
--- a/hash/gameboy.xml
+++ b/hash/gameboy.xml
@@ -24894,20 +24894,7 @@
</part>
</software>
- <software name="zoop">
- <description>Zoop (Euro, USA)</description>
- <year>1995</year>
- <publisher>Viacom NewMedia</publisher>
- <info name="serial" value="DMG-AZPE-USA, DMG-AZPP-EUR"/>
- <part name="cart" interface="gameboy_cart">
- <feature name="slot" value="rom_mbc1" />
- <dataarea name="rom" size="65536">
- <rom name="zoop (usa, europe).bin" size="65536" crc="14f8b6bb" sha1="1e0390d456066b9fbe1faff5f7404d4593a2b839" offset="000000" />
- </dataarea>
- </part>
- </software>
-
- <software name="zoopj" cloneof="zoop">
+ <software name="zoopj" cloneof="zool">
<!-- Notes: SGB enhanced -->
<description>Zoop (Jpn)</description>
<year>1997</year>
@@ -24923,8 +24910,6 @@
</part>
</software>
-<<<<<<< HEAD
-=======
<software name="zoop">
<description>Zoop (Euro, USA)</description>
<year>1995</year>
@@ -24933,12 +24918,11 @@
<part name="cart" interface="gameboy_cart">
<feature name="slot" value="rom_mbc1" />
<dataarea name="rom" size="65536">
- <rom name="zoop (usa, europe).bin" size="65536" crc="14f8b6bb" sha1="1e0390d456066b9fbe1faff5f7404d4593a2b839" offset="0" />
+ <rom name="zoop (usa, europe).bin" size="65536" crc="14f8b6bb" sha1="1e0390d456066b9fbe1faff5f7404d4593a2b839" offset="000000" />
</dataarea>
</part>
</software>
->>>>>>> upstream/master
<!-- Sachen carts -->
<software name="4in1_001">