James Chen e584b94728 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into js ... Conflicts: scripting/javascript/bindings/cocos2d_generated.cpp		2012-08-30 20:16:54 +08:00
..
javascript	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into js	2012-08-30 20:16:54 +08:00
lua	issue #1425: update pkg and recreate LuaCococs2d.cpp	2012-08-30 15:33:54 +08:00