Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/support
History
dumganhar db4d51496e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada 
Conflicts:
	cocos2dx/platform/CCAccelerometer_platform.h
	cocos2dx/platform/CCApplication_platform.h
	cocos2dx/platform/CCArchOptimalParticleSystem.h
	cocos2dx/platform/CCEGLView_platform.h
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/platform/CCSAXParser.h
	cocos2dx/platform/CCStdC.h
	tests/AppDelegate.cpp
	tests/tests/Box2DTestBed/Tests/EdgeShapes.h
 		2011-09-29 16:03:37 +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 changed bada projects directory, add bada macro 2011-09-19 17:53:45 +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 changed bada projects directory, add bada macro 2011-09-19 17:53:45 +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