Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id

1 line
40 B
Plaintext
Raw Normal View History

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-14 02:28:54 +08:00
b347c177e552f5a7b345253c78b21dad031a9d8a