axmol/cocos/scripting/js-bindings
pandamicro 8692ee176c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
Conflicts:
	cocos/network/HttpAsynConnection-apple.m
	cocos/network/HttpClient-android.cpp
	cocos/network/HttpClient.cpp
	cocos/network/HttpCookie.h
	cocos/network/HttpRequest.h
	cocos/network/HttpResponse.h
	cocos/network/SocketIO.cpp
	cocos/network/WebSocket.h
2016-05-25 19:19:27 +08:00
..
auto [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-05-06 05:44:31 +00:00
manual Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2016-05-25 19:19:27 +08:00
proj.android Squashed commit of the following: 2016-02-29 13:53:00 -08:00
proj.ios_mac/cocos2d_js_bindings.xcodeproj Squashed commit of the following: 2016-02-29 13:53:00 -08:00
proj.win8.1-universal/libjscocos2d Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
proj.win32 Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
script Merge pull request #15619 from VisualSJ/v3_audio 2016-05-19 18:06:58 +08:00
.gitignore Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
CMakeLists.txt Removed unnecessary search paths. 2016-03-22 16:04:12 +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.