4 commits

Author	SHA1	Message	Date
Vas Crabb	97b6717027	(nw) Clean up the mess on master ... This effectively reverts b380514764 and c24473ddff, restoring the state at 598cd52272. Before pushing, please check that what you're about to push is sane. Check your local commit log and ensure there isn't anything out-of-place before pushing to mainline. When things like this happen, it wastes everyone's time. I really don't need this in a week when real work™ is busting my balls and I'm behind where I want to be with preparing for MAME release.	2019-03-26 11:13:37 +11:00
andreasnaive	b380514764	Revert "conflict resolution (nw)" ... This reverts commit c24473ddff, reversing changes made to 009cba4fb8.	2019-03-25 23:13:40 +01:00
Nigel Barnes	15fc7aac93	New working software list additions ... ----------------------------------- mtx_flop: CP/M System Disk (SDX), CP/M System Disk (FDX), dBASE II, Modem Executive 1.14, FDX NewWord, SuperCalc, Tape to Disc Transfer (FDX and CP/M only), Turbo PASCAL 2.00A, Turbo PASCAL 3.00A, WordStar 3.00	2019-03-10 17:25:39 +00:00
Nigel Barnes	d3e16b73dc	New working software list additions ... ----------------------------------- mtx_rom: MTX NewWord, Hisoft PASCAL New NOT_WORKING software list additions --------------------------------------- mtx_cart: MTX Node Ring mtx_cass: Demonstration Tape, MTX Draughts	2017-11-24 16:37:13 +00:00