axmol/cocos/scripting/js-bindings
pandamicro 85d4ce0d5a Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
	docs/RELEASE_NOTES.md
	tools/cocos2d-console
	tools/tojs/cocos2dx.ini
2015-07-21 11:39:24 +08:00
..
auto Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-21 11:39:24 +08:00
manual Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-21 11:39:24 +08:00
proj.android Solve the error when building simulator for android. 2015-06-30 16:45:13 +08:00
proj.ios_mac/cocos2d_js_bindings.xcodeproj Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7 2015-07-03 10:23:49 +08:00
proj.win8.1-universal/libjscocos2d winphone project 2015-06-18 22:50:24 +08:00
proj.win32 fix the win32 head error 2015-06-18 21:30:30 +08:00
script Merge pull request #12879 from pandamicro/v3.7-release 2015-07-16 16:55:24 +08:00
.gitignore Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
CMakeLists.txt Fix linux compilation 2015-06-19 01:14:16 +08:00
README.md Update js bindings & js tests. 2015-05-05 10:50:19 +08:00

README.md

js-bindings

This repo is used for js bindings.