Merge branch 'tests_js_3.0'

cocos2d / cocos2d-js-tests

cocos2d JavaScript test cases and games.

187 stars 222 forks source link

Merge branch 'tests_js_3.0' #346

Closed SmallAiTT closed 10 years ago

SmallAiTT commented 10 years ago

...ts into tests_js_3.0_ccgame

Conflicts: tests/ActionsTest/ActionsTest.js tests/OpenGLTest/OpenGLTest.js tests/PerformanceTest/PerformanceSpriteTest.js tests/PerformanceTest/PerformanceTextureTest.js tests/tests-main.js