pandamicro fc19435123 Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory ... Conflicts: cocos/base/ccConfig.h cocos/scripting/js-bindings/manual/ScriptingCore.cpp cocos/scripting/js-bindings/manual/ScriptingCore.h cocos/scripting/js-bindings/script/jsb_prepare.js		2016-01-18 16:40:00 +08:00
..
project	Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory	2016-01-18 16:40:00 +08:00
resjs	Merge pull request #13463 from ZhangMenghe/v3.8-materialSys	2015-08-19 13:49:31 +08:00
src	Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory	2016-01-18 16:40:00 +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