Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/include
History
carlo morgantini b2579987e5 Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/include/ccTypes.h
	samples/samples.xcodeproj/project.pbxproj
 		2013-07-31 13:58:25 -07:00
..
CCDeprecated.h Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge 2013-07-31 13:58:25 -07:00
CCEventType.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCProtocols.h Documentation fix: add missing parameter name. 2013-07-29 19:36:47 +08:00
ccConfig.h ccGLXXX -> GL::xxx 2013-07-25 18:42:53 -07:00
ccMacros.h ccGLXXX -> GL::xxx 2013-07-25 18:42:53 -07:00
ccTypeInfo.h CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
ccTypes.h Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge 2013-07-31 13:58:25 -07:00
cocos2d.h Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge 2013-07-31 13:58:25 -07:00