andreasnaive b380514764 Revert "conflict resolution (nw)" ... This reverts commit c24473ddff, reversing changes made to 009cba4fb8.		2019-03-25 23:13:40 +01:00
..
Asm	Update LZMA SDK to 15.14	2016-04-09 21:52:08 +10:00
C	Revert "conflict resolution (nw)"	2019-03-25 23:13:40 +01:00
CPP	Update LZMA to 16.04 (security and portability fixes)	2016-11-18 20:37:20 +11:00
CS/7zip	Added full lzma sdk source (nw)	2015-01-11 08:10:25 +01:00
DOC	Update LZMA to 16.04 (security and portability fixes)	2016-11-18 20:37:20 +11:00
Java/SevenZip	Added full lzma sdk source (nw)	2015-01-11 08:10:25 +01:00