XiaoFeng ab0efd933a Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: CHANGELOG cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp tests/js-tests/src/RenderTextureTest/RenderTextureTest.js		2016-01-09 18:01:56 +08:00
..
project	adds tvOS support	2015-12-28 15:59:36 -08:00
resjs	Merge pull request #13463 from ZhangMenghe/v3.8-materialSys	2015-08-19 13:49:31 +08:00
src	Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3	2016-01-09 18:01:56 +08:00
.cocos-project.json	Add copy resources config of js-tests for web platform.	2015-08-10 12:00:53 +08:00
TestCase.html	Update js bindings & js tests.	2015-05-05 10:50:19 +08:00
index.html	fix js-tests can't use cocos run -p web -m release	2015-08-10 15:10:54 +08:00
main.js	Adds iOS tests, calls GC after replacing scene	2015-12-29 17:36:02 -08:00
mobilePage.html	Add js test case for fix, improve template	2015-12-03 16:55:15 +08:00
project.json	Adds MemoryModelTest	2015-12-10 18:22:10 -08:00