diff options
author | 2016-06-29 22:40:31 -0400 | |
---|---|---|
committer | 2016-06-29 22:40:31 -0400 | |
commit | f5e94b0537fb2686d23bf953584e10f42f289b22 (patch) | |
tree | 9c51de09dcadf66494021dc9ae61cc8fca269df4 /src | |
parent | 3ffafa2225cbfe7a745a26975f706c473900fd2d (diff) | |
parent | c0fc78d341d5f99f4ee16845e519f2c4662b459c (diff) |
Merge branch 'master' of https://github.com/mamedev/mame.git
Diffstat (limited to 'src')
-rw-r--r-- | src/mame/drivers/nbmj8688.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/lib/osdlib_macosx.cpp | 1 | ||||
-rw-r--r-- | src/osd/modules/lib/osdlib_unix.cpp | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/mame/drivers/nbmj8688.cpp b/src/mame/drivers/nbmj8688.cpp index 2721e9010fa..12bc50dc56d 100644 --- a/src/mame/drivers/nbmj8688.cpp +++ b/src/mame/drivers/nbmj8688.cpp @@ -4096,7 +4096,7 @@ GAME( 1988, korinaim, korinai, korinaim, korinaim, driver_device, 0, /* pure 16-bit palette (+ LCD in some) */ GAME( 1987, housemnq, 0, housemnq, housemnq, driver_device, 0, ROT0, "Nichibutsu", "House Mannequin (Japan 870217)", MACHINE_SUPPORTS_SAVE ) GAME( 1987, housemn2, 0, housemn2, housemn2, driver_device, 0, ROT0, "Nichibutsu", "House Mannequin Roppongi Live hen (Japan 870418)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, livegal, 0, livegal, livegal, driver_device, 0, ROT0, "Central Denshi", "Live Gal (Japan 870530)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, livegal, 0, livegal, livegal, driver_device, 0, ROT0, "Central Denshi", "Live Gal [BET] (Japan 870530)", MACHINE_SUPPORTS_SAVE ) GAME( 1987, bijokkoy, 0, bijokkoy, bijokkoy, driver_device, 0, ROT0, "Nichibutsu", "Bijokko Yume Monogatari (Japan 870925)", MACHINE_SUPPORTS_SAVE ) GAME( 1988, bijokkog, 0, bijokkog, bijokkog, driver_device, 0, ROT0, "Nichibutsu", "Bijokko Gakuen (Japan 880116)", MACHINE_SUPPORTS_SAVE ) GAME( 1988, orangec, 0, orangec, orangec, driver_device, 0, ROT0, "Daiichi Denshi", "Orange Club - Maruhi Kagai Jugyou (Japan 880213)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/osd/modules/lib/osdlib_macosx.cpp b/src/osd/modules/lib/osdlib_macosx.cpp index 770078a254f..18730ea70ff 100644 --- a/src/osd/modules/lib/osdlib_macosx.cpp +++ b/src/osd/modules/lib/osdlib_macosx.cpp @@ -15,7 +15,6 @@ #include <signal.h> #include <dlfcn.h> -#include <codecvt> #include <iomanip> #include <memory> diff --git a/src/osd/modules/lib/osdlib_unix.cpp b/src/osd/modules/lib/osdlib_unix.cpp index 3f3bbb00269..a504dec8aa3 100644 --- a/src/osd/modules/lib/osdlib_unix.cpp +++ b/src/osd/modules/lib/osdlib_unix.cpp @@ -15,7 +15,6 @@ #include <signal.h> #include <dlfcn.h> -#include <codecvt> #include <iomanip> #include <memory> |