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 data-refactor Conflicts: cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
2013-12-23 11:57:29 +08:00
7ca5b334921bd71783d2c8fb31efc09f8dea8afd