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

Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2404-deprecated

This commit is contained in:
James Chen 2013-07-18 13:41:09 +08:00
parent 6277ae191b d4a3e0a152
commit 12ac3105b7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -528,6 +528,7 @@ Developers:
Sam Gross (colesbury)
Ignoring formatting specifiers in JavaScript log messages.
Make bindings-generator supports to bind std::function argument.
James Munro (jdmunro)
Added JSB support for ccpDistanceSQ.

2
scripting/javascript/bindings/generated

@ -1 +1 @@
Subproject commit 45f4ad294f5936f93e4982210740ff65f74c08e8
Subproject commit 8445d4412d1548a509f42976ce9e96d5ac6f49a3