dumganhar 4b9cbb85ff #issue 908: Merge marmalade to latest cocos2d-x source ... Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade Conflicts: cocos2dx/platform/CCFileUtils.cpp cocos2dx/platform/CCPlatformConfig.h cocos2dx/support/zip_support/ioapi.cpp		2011-12-12 17:46:21 +08:00
..
ZipUtils.cpp	issue #879: replase assert with CCAssert	2011-11-28 17:28:43 +08:00
ZipUtils.h	fixed #701, CCZHeader.version should be an unsigned short, instead of unsigned char. Keep the same to cocos2d-iphone	2011-08-30 15:26:17 +08:00
ioapi.cpp	#issue 908: Merge marmalade to latest cocos2d-x source	2011-12-12 17:46:21 +08:00
ioapi.h	issue #379, fix a bug caused by airplay port integration, which makes android port unable to load resources by zlib.	2011-03-26 14:09:42 +08:00
unzip.cpp	fix some warnings detected by xcode4.2, fix a stupid typo in RayCasts.h	2011-10-18 17:41:19 +08:00
unzip.h	fixed #262 Add namespace for the project CocosDenshion.	2010-12-15 18:28:18 +08:00