2 commits

Author	SHA1	Message	Date
Edward Richardson	e5c67cee83	Merge branch conflicts fix ... - CONFLICT (content): Merge conflict in src/p_acs.cpp - Updated position variables	2016-01-21 10:49:57 +13:00
alexey.lysiuk	262580c92f	Updated LZMA SDK to version 15.14 ... Enabled support for PPMD compression method	2015-12-31 17:25:49 +02:00