James Chen 8f6c8e202e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests ... Conflicts: samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp		2012-11-20 16:35:42 +08:00
..
ShaderTest.cpp	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests	2012-11-20 16:35:42 +08:00
ShaderTest.h	issue #1564:update ShaderTest	2012-11-20 16:16:16 +08:00