(mess) pc9801: bit more (nw)
added sega_315_5296_device
Alignment fixes for recent changes to XML hashes. (nw)
added asserts for n64 -cart conker crash in mips3_device::generate_checksum_block() (nw)
added assert  for e.g. n64 -cart waveracej crash in rsp_device::generate_checksum_block() (nw)
Prevent calls to osd_read/write when m_pSocket is NULL [nw]
calomega.c: Improve color emulation by analogy with tugboat.c (which is actually a heavily modified Cal Omega board) [Alex Jackson]
miniboy7.c: Slightly improve colors (see gfx2 color 4, now correct playing card colors) (nw)
First batch of tilemap assert fixes (nw)
whops. these were meant to be <info> and not <feature>. nw.
Revert "added assert  for e.g. n64 -cart waveracej crash in rsp_device::generate_checksum_block() (nw)"

This reverts commit 491842f8db702b2ccd94c7f0ae78482ab48cef05.
Revert "Revert "added assert  for e.g. n64 -cart waveracej crash in rsp_device::generate_checksum_block() (nw)""

This reverts commit 36218e2220cca2d31121a06c314ad11f72431527.
Merge branch 'master' of https://github.com/mamedev/mame
Merge https://github.com/mamedev/mame