Bohdan Hernandez 553c4be486 Merge remote-tracking branch 'upstream/master' ... * upstream/master: Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning Conflicts: SSZipArchive/minizip/ioapi.c		2014-11-05 20:51:56 +00:00
..
minizip	Merge remote-tracking branch 'upstream/master'	2014-11-05 20:51:56 +00:00
SSZipArchive.h	Adds progress and completion handlers.	2014-07-29 18:54:28 +01:00
SSZipArchive.m	Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning	2014-10-31 11:09:31 +01:00