angelosa 358271ab3f Merge branch 'master' into c148_rewrite ... # Conflicts: # hash/ibm5150.xml # src/mame/drivers/gsword.cpp # src/mame/drivers/rm380z.cpp # src/mame/drivers/rohga.cpp		2017-01-02 04:15:37 +01:00
..
devices	zeus2: Fix unused variable. (nw)	2017-01-01 11:10:23 -07:00
emu	Fix for a potential problem if natural keyboard input gets disabled while machine is running (nw)	2016-12-31 17:11:10 -05:00
frontend/mame	first srcclean pass (nw)	2016-12-25 13:57:31 +11:00
lib	Hopefully fix OSX crashes during netlist setup. (nw)	2017-01-01 17:01:26 +01:00
mame	Merge branch 'master' into c148_rewrite	2017-01-02 04:15:37 +01:00
osd	Fix OSX build - no idea why it wasn't breaking before (nw)	2016-12-31 22:20:28 +01:00
tools	[Imgtool CoCo/RS-DOS] Miscellaneous cleanups and C++ modernization	2016-12-31 22:19:11 +01:00
zexall