Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-20 23:42:22 +03:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

reverted last change (nw)

Browse Source
This commit is contained in:
sparrowred 2016-12-23 14:49:39 +01:00
parent d0b0de1aec
commit 3cd0e74eb4
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hash/gameboy.xml
View File

@ -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">