Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ricorigin/freetype' into developNewLabel<<<<<<< HEAD 

=======

>>>>>>> origin
This commit is contained in:
carlo morgantini 2013-07-12 12:41:16 -07:00
parent e4af13f1f6 a598db0db0
commit a4073025d5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/platform/third_party/ios/libraries/libfreetype.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
d7aadc26949fd0c01f85fc2ad1e9ff199e8da4a2
3303f759eb8c682843322ffa9f8c69563d241ca5

2
cocos2dx/platform/third_party/mac/libraries/libfreetype.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
b6c881ffba60e89164dd07b80005ab06c309d77b
c0b1bb79bbf25fa30a0d47f60f655f30bd4efbad