Closed SmallAiTT closed 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
...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