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
..
javascript	issue #1564: Deleted duplicated declare in ScriptingCore.h	2012-11-20 16:26:06 +08:00
lua	Merge pull request #1592 from fape/luaCocos2d	2012-11-19 17:36:25 -08:00