laschweinski 1fc09448a4 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into LinuxPort ... Conflicts: cocos2dx/actions/CCActionInstant.cpp cocos2dx/include/CCActionInstant.h		2011-09-04 14:38:53 +08:00
..
data_support	modified: HelloWorld/AppDelegate.cpp	2011-08-17 11:36:54 +08:00
image_support	fixed #587	2011-07-08 14:15:51 +08:00
zip_support	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
CCArray.cpp	fixed #563, Upgrade folder support to rc3.	2011-07-05 12:05:19 +08:00
CCPointExtension.cpp	fixed #588.	2011-07-08 14:16:10 +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	fixed #619 CCFadeTo may crashed on android	2011-07-27 16:21:00 +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