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 47be4ff58a Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean 
Conflicts:
	cocos2dx/label_nodes/CCFontAtlas.cpp
	cocos2dx/label_nodes/CCFontAtlas.h
	cocos2dx/label_nodes/CCFontAtlasCache.cpp
	cocos2dx/label_nodes/CCFontAtlasFactory.cpp
	cocos2dx/label_nodes/CCFontAtlasFactory.h
	cocos2dx/label_nodes/CCFontDefinition.cpp
	cocos2dx/label_nodes/CCFontFreeType.cpp
	cocos2dx/label_nodes/CCLabel.cpp
	cocos2dx/label_nodes/CCLabel.h
	cocos2dx/label_nodes/CCStringBMFont.h
	cocos2dx/label_nodes/CCStringTTF.cpp
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
 		2013-08-13 11:28:54 -07:00
..
CCDeprecated.h Merge branch 'develop' into carlomorgantinizynga-new_develop_merge 2013-08-05 10:09:15 +08:00
CCEventType.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCProtocols.h Fixed more documentation errors. 2013-08-01 20:55:43 +08:00
ccConfig.h Up refresh interval to 2 secs 2013-08-05 02:04:25 -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 some more clean up and removed CCStringTTF 2013-08-07 16:36:04 -07:00