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

1 line
40 B
Plaintext
Raw Normal View History

Merge branch 'developNewLabelForRiq' into label_merge Conflicts: cocos2dx/textures/CCTexture2D.h samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp scripting/javascript/bindings/generated tools/bindings-generator
2013-07-25 06:15:08 +08:00
27e33687fe11748b4214aa67ea2e3e658e43178c