James Chen 85304b9441 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_lua		2012-08-24 10:27:20 +08:00
..
javascript	Fixed a compile in cocos2d_generated.cpp.	2012-08-03 10:44:48 +08:00
lua	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_lua	2012-08-24 10:27:20 +08:00