Previous 199869 Revisions Next

r90971 Wednesday 31st January, 2018 at 01:32:33 UTC by Vasantha Crabb
Merge remote-tracking branch 'origin/master' into release0194

Conflicts:
  language/German/strings.po
  plugins/cheatfind/init.lua
  src/mame/drivers/ti85.cpp
[plugins/cheatfind]init.lua
[src/devices/machine]74157.cpp
[src/devices/video]clgd542x.cpp clgd542x.h i8275.cpp i8275.h tms9927.cpp tms9927.h
[src/lib/netlist/plib]ppmf.h pstring.cpp
[src/mame]mame.lst
[src/mame/drivers]alphatpx.cpp asteroid.cpp fmtowns.cpp galaxold.cpp itt3030.cpp namcos1.cpp pce.cpp photoply.cpp tv912.cpp vii.cpp
[src/mame/includes]asteroid.h fmtowns.h namcos1.h
[src/mame/machine]asteroid.cpp
[src/mame/video]fmtowns.cpp intv.cpp


Previous 199869 Revisions Next


© 1997-2024 The MAME Team