mirror of https://github.com/axmolengine/axmol.git
7820610f13
Conflicts: cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj tests/js-tests/project.json tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js tools/tojs/genbindings.py |
||
---|---|---|
.. | ||
AppDelegate.cpp | ||
AppDelegate.h | ||
js_DrawNode3D_bindings.cpp | ||
js_DrawNode3D_bindings.h | ||
js_Effect3D_bindings.cpp | ||
js_Effect3D_bindings.h |