Merge branch 'release0187'

Conflicts:
	src/mame/drivers/accomm.cpp
This commit is contained in:
Vas Crabb 2017-06-25 15:19:30 +10:00
commit 41e1555242
79 changed files with 556 additions and 556 deletions

View File

@ -1,4 +1,4 @@
// license:BSD-3-Clause
// license:BSD-3-Clause
// copyright-holders:tim lindner
/***************************************************************************

View File

@ -672,7 +672,7 @@ static INPUT_PORTS_START( accomm )
PORT_START("LINE2.1")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L')
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR(0xa3)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR(0xa3) // £
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O')
PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K')

View File

@ -1,5 +1,5 @@
// license:BSD-3-Clause
// copyright-holders:Jean-François DEL NERO
// copyright-holders:Jean-François DEL NERO
/***************************************************************************
SMT Goupil G1 & G2 driver
@ -17,7 +17,7 @@
-> The internal G1 Basic is working (-> 6800 0xC3 illegal opcode emulation needed).
02/04/2016
Jean-François DEL NERO
Jean-François DEL NERO
****************************************************************************/