You can take the current version and try to revert just the votrax changes(2c79c1ed) but it looks like there are conflicts on some of the files and they have to be resolved. I've tried resolving but still get compiler errors because I'm not that familiar with the code, but if somebody has any idea of how to merge those back with HEAD we could use the current mame version with the old samples.
Unmerged paths: both modified: src/devices/sound/votrax.cpp both modified: src/devices/sound/votrax.h both modified: src/mame/audio/gottlieb.cpp both modified: src/mame/audio/gottlieb.h both modified: src/mame/drivers/astrocde.cpp
Index 
Flat 
Re: minor MAME samples question.
Reply
