cocos2d/cocos2d-js-tests — pull request #346 by SmallAiTT (2014-03-01 10:13:21+00:00)
Title: Merge branch 'tests_js_3.0' 

...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