Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOV...

1 line
40 B
Plaintext
Raw Normal View History

Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug Conflicts: cocos/2d/CCTMXXMLParser.cpp cocos/2d/CCTMXXMLParser.h
2013-12-30 12:30:59 +08:00
887e2d3869dfa674b390e1373c94937ae965ea6f