Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/cocoa
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
..
CCAffineTransform.cpp Non-trivial arguments passed by reference now. 2011-08-17 17:26:26 +04:00
CCAutoreleasePool.cpp fix a typo, CCObject::m_uRefrence -> CCObject::m_uReference 2011-07-07 08:23:31 +08:00
CCData.cpp fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
CCGeometry.cpp changed bada projects directory, add bada macro 2011-09-19 17:53:45 +08:00
CCNS.cpp Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada 2011-09-29 16:03:37 +08:00
CCNS.h fixed #605, add CC_DLL to pure C methods in CCNS.h 2011-07-12 17:10:10 +08:00
CCObject.cpp fix a typo, CCObject::m_uRefrence -> CCObject::m_uReference 2011-07-07 08:23:31 +08:00
CCSet.cpp [android] fixed #609: retain & release obj in CCSet 2011-07-14 15:32:11 +08:00
CCZone.cpp issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00