Commit graph

10 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
bb99eba11d Update LZMA to 16.04 (security and portability fixes) 2016-11-18 20:37:20 +11:00
Vas Crabb
7a423d0160 Update to LZMA 16.0 [Vas Crabb] 2016-05-12 00:06:54 +10:00
Vas Crabb
e925c494fe Update LZMA SDK to 15.14 2016-04-09 21:52:08 +10:00
Miodrag Milanovic
9b82f7b2e7 Revert "lzma pedantic fixes (nw)"
No updating of 3rdparty allowed

This reverts commit 94aa0602d5.
2015-10-10 08:09:12 +02:00
Cowering
94aa0602d5 lzma pedantic fixes (nw) 2015-10-09 14:57:36 -05:00
Miodrag Milanovic
d67caf1860 Applied changes same as on previous source (nw) 2015-01-11 08:30:12 +01:00
Miodrag Milanovic
6a23c2f3b7 Added full lzma sdk source (nw) 2015-01-11 08:10:25 +01:00