6 Commits

Author	SHA1	Message	Date
Felix Kauselmann	7f04e688f4	fix merge	2015-03-22 16:33:38 +01:00
Felix Kauselmann	8c5f258f3e	resolve conflict	2015-03-22 16:31:09 +01:00
Felix Kauselmann	1cd8a3f31b	Fix p7zip compressed archive test for mac/linux	2015-03-22 01:09:05 +01:00
Luis Ángel San Martín	f713254584	merged	2015-03-21 19:21:06 +01:00
Luis Ángel San Martín	743d896649	merged	2015-03-21 14:40:25 +01:00
Luis Ángel San Martín	c0348abe8f	added an specific branch for CompressedArchive testing	2015-03-21 10:36:02 +01:00