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
Peter Ferrie	d199ec2657	fix MSVC (llvm toolset) compile (nw) ... - conditionally uninitialised variables in PortAudio; - floats passed to attotime; - unsigned->signed enums (this one is technically still wrong)	2019-01-06 18:17:35 -08:00
Vas Crabb	e925c494fe	Update LZMA SDK to 15.14	2016-04-09 21:52:08 +10:00