Commit Graph

7 Commits

Author SHA1 Message Date
Vas Crabb
97b6717027 (nw) Clean up the mess on master
This effectively reverts b380514764 and
c24473ddff, restoring the state at
598cd52272.

Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline.  When things like this happen, it wastes
everyone's time.  I really don't need this in a week when real work™ is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
2019-03-26 11:13:37 +11:00
andreasnaive
b380514764 Revert "conflict resolution (nw)"
This reverts commit c24473ddff, reversing
changes made to 009cba4fb8.
2019-03-25 23:13:40 +01:00
ClawGrip
d01a6b7049 vtech_storio_cart.xml: Fix Scooby game year (#4704) 2019-03-05 17:39:58 +01:00
Vas Crabb
76323eb770 srcclean and cleanup (nw) 2019-01-27 14:22:20 +11:00
ClawGrip
eb77b9baf6
vtech_storio_cart.xml: New NOT_WORKING software list additions
----------------------------
Rapunzel - Neu verföhnt (Germany) [TeamEurope]
Spongebob Schwammkopf - Ein Schwamm will nach oben (Germany) [TeamEurope]
Micky Maus Wunderhaus (Germany) [TeamEurope]
Dora und die drei Schweinchen (Germany) [TeamEurope]
2019-01-24 11:52:57 +01:00
ClawGrip
864e84465b
vtech_storio_cart.xml: Improve notes (nw) 2019-01-21 03:17:08 +01:00
David Haywood
6a9f8b89a0 new NOT WORKING ---- Storio [Team Europe] (#4514)
* new NOT WORKING
----
Storio [Team Europe]

created this so that Clawgrip can add to it

* add seemingly pointless line to seemingly pointless file

* move info (nw)

* vtech (nw)
2019-01-18 20:08:05 -05:00