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
..
data_support	remove some '__QNX__' macros	2011-12-12 16:14:12 +08:00
image_support	fixed #587	2011-07-08 14:15:51 +08:00
zip_support	#issue 908: Merge marmalade to latest cocos2d-x source	2011-12-12 17:46:21 +08:00
CCArray.cpp	fixed #563, Upgrade folder support to rc3.	2011-07-05 12:05:19 +08:00
CCPointExtension.cpp	Fix a typo here. Two values are not swapped correctly, max_inclusive is still equal to itself.	2011-11-26 17:07:36 +08:00
CCProfiling.cpp	fixed a warning in CCProfiling.cpp	2011-04-29 10:08:35 +08:00
CCProfiling.h	issue #468, Fix the compile error when the target platform is not win32.	2011-04-25 15:05:16 +08:00
CCUserDefault.cpp	modified: HelloWorld/AppDelegate.cpp	2011-08-17 11:36:54 +08:00
TransformUtils.cpp	fixed #418, add copyright of original authors, merge Bin's commit	2011-03-19 14:45:51 +08:00
TransformUtils.h	fixed #418, add copyright of original authors, merge Bin's commit	2011-03-19 14:45:51 +08:00
base64.cpp	add Cocos2dx project	2011-12-06 14:56:37 +08:00
base64.h	issue #211 cocos2d-x back to cocos2dx	2010-11-18 15:01:42 +00:00
ccUtils.cpp	fixed #563, Upgrade folder support to rc3.	2011-07-05 12:05:19 +08:00
ccUtils.h	fixed #563, Upgrade folder support to rc3.	2011-07-05 12:05:19 +08:00