pandamicro 436564f922 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: docs/RELEASE_NOTES.md web		2015-07-15 14:39:40 +08:00
..
project	add bool parm in android	2015-07-01 10:57:43 +08:00
resjs	modify js resource name	2015-05-27 09:52:44 +08:00
src	Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3	2015-07-15 14:39:40 +08:00
.cocos-project.json	Solve the error when run tests projects with `cocos run`.	2015-06-24 15:33:13 +08:00
TestCase.html	Update js bindings & js tests.	2015-05-05 10:50:19 +08:00
index.html	Update js bindings & js tests.	2015-05-05 10:50:19 +08:00
main.js	modify copy resource to res/resjs	2015-06-15 09:53:53 +08:00
mobilePage.html	Update js bindings & js tests.	2015-05-05 10:50:19 +08:00
project.json	Merged changes from "Vibrate support in v4" into v3 branch.	2015-06-26 01:02:44 +02:00