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
..
android	issue #838: HelloWorld support x86	2011-11-23 11:02:18 +08:00
bada	remove some '__QNX__' macros	2011-12-12 16:14:12 +08:00
ios	libcurl works ok on ios	2011-04-18 14:12:41 +08:00
linux	bundle 64 bit linux static libs	2011-10-28 12:19:26 +08:00
marmalade	Added marmalade support, removed airplay	2011-12-11 10:19:41 +01:00
qnx	add some files for qnx	2011-12-07 16:22:40 +08:00
win32	issue #854: add pthread for win32 and implement CCTextureCache::addImageAsync()	2011-11-16 11:04:29 +08:00