summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/arcade.flt
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/arcade.flt
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/arcade.flt')
-rw-r--r--src/mame/arcade.flt4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mame/arcade.flt b/src/mame/arcade.flt
index 5f490afbb11..b8f412fb2b5 100644
--- a/src/mame/arcade.flt
+++ b/src/mame/arcade.flt
@@ -256,7 +256,6 @@ cpzodiac.cpp
crbaloon.cpp
crgolf.cpp
crimfght.cpp
-cromptons.cpp
crospang.cpp
crshrace.cpp
crystal.cpp
@@ -400,7 +399,6 @@ foodf.cpp
forte2.cpp
fortecar.cpp
freekick.cpp
-freeway.cpp
fresh.cpp
fromanc2.cpp
fromance.cpp
@@ -749,7 +747,6 @@ minivideo.cpp
mirage.cpp
mirax.cpp
missb2.cpp
-missbamby.cpp
missile.cpp
mitchell.cpp
mjkjidai.cpp
@@ -1307,7 +1304,6 @@ unianapc.cpp
unico.cpp
unkfr.cpp
unkhorse.cpp
-unkpoker.cpp
upscope.cpp
usbilliards.cpp
usgames.cpp