stupid mistake, fixed with svn merge command (http://aralbalkan.com/1381)

This commit is contained in:
Angelo Salese 2010-01-31 23:08:16 +00:00
parent a165af4b1b
commit fd6a695c16
2 changed files with 4 additions and 3 deletions

View File

@ -1142,7 +1142,7 @@ $(MAMEOBJ)/sega.a: \
$(DRIVERS)/stv.o $(DRIVERS)/stvinit.o $(MACHINE)/stvprot.o $(MACHINE)/stvcd.o \
$(DRIVERS)/suprloco.o $(VIDEO)/suprloco.o \
$(DRIVERS)/system1.o $(VIDEO)/system1.o \
$(DRIVERS)/system16.o $(MACHINE)/system16.o $(VIDEO)/system16.o $(VIDEO)/sys16spr.o \
$(DRIVERS)/system16.o $(VIDEO)/system16.o \
$(DRIVERS)/timetrv.o \
$(DRIVERS)/topshoot.o \
$(DRIVERS)/turbo.o $(AUDIO)/turbo.o $(VIDEO)/turbo.o \

View File

@ -5576,7 +5576,8 @@ BOMULEUL CHAJARA SEGA ST-V 1997/04/11
DRIVER( le2j ) /* 1994.06 GX312 (Japan) */
DRIVER( puzldama ) /* 1994.07 GX315 (Japan) */
DRIVER( gokuparo ) /* 1994.04 GX321 (Japan) */
DRIVER( fantjour ) /* 1994.?? GX321 (US?) */
DRIVER( fantjour ) /* 1994.?? GX321 (Euro) */
DRIVER( fantjoura ) /* 1994.?? GX321 (Asia) */
DRIVER( dragoona ) /* 1995.?? GX417 (Asia) */
DRIVER( dragoonj ) /* 1995.08 GX417 (Japan) */
DRIVER( tbyahhoo ) /* 1995.04 GX424 (Japan) */
@ -9117,11 +9118,11 @@ Other Sun games
DRIVER( victor5 ) /* (c) 1990 Subsino */
DRIVER( victor21 ) /* (c) 1990 Subsino */
DRIVER( crsbingo ) /* (c) 1991 Subsino */
DRIVER( tisub ) /* (c) 1991 Subsino */
DRIVER( sharkpy ) /* (c) 1993 Subsino */
DRIVER( sharkpya ) /* (c) 1993 Subsino */
DRIVER( smoto20 ) /* (c) 1996 Subsino */
DRIVER( smoto16 ) /* (c) 1996 Subsino */
DRIVER( tisub )
DRIVER( saklove ) /* (c) 1998 Subsino */
DRIVER( bishjan ) /* (c) 1999 Subsino */
DRIVER( lastfght ) /* (c) 2000 Subsino */