jianglong0156 d5a6522a37 Merge branch 'v3' into constructedWith3D#12404		2015-07-28 09:59:35 +08:00
..
project	Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.	2015-07-22 12:01:34 +08:00
resjs	modify js resource name	2015-05-27 09:52:44 +08:00
src	Merge branch 'v3' into constructedWith3D#12404	2015-07-28 09:59:35 +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	Add testCase for setClearColor	2015-07-21 15:18: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	add fileUtils writeString,writeValueMap,writeValueVector	2015-07-17 12:04:47 +08:00