line endings
Merge branch 'master' of https://github.com/mamedev/mame
(MESS) wswan: converted the video chip to be a device. nw.
Merge branch 'master' of https://github.com/mamedev/mame
psychic5.c: a little more 2014 (nw)
ramsize (nw)
naomi.c:
kingrt66 use real MaskROM cart layout and labels instead of flashcart [Arzeno Fabrice]
docs updates [MetalliC]
removed unused variable (nw)
(MESS) astrocade: converted the expansion bus to be a slot
device, and converted RAM expansions to be slot cards. As a
result you now specify the expansion you want by using e.g.
    mess astrocde -exp blue_ram_32k
or the Slot Devices menu of the internal UI, instead of using the
DipSwitches menu. Check the -lslot output for a list of available
expansions. [Fabio Priuli]
Merge pull request #23 from p1pkin/naomi#2

Naomi updates
Use the same list of centronics devices everywhere (except the Amstrad CPC), the list has been renamed as they aren't all printers. [smf]
Merge remote-tracking branch 'upstream/master'