Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1653-jsb-int

This commit is contained in:
James Chen 2013-01-11 20:46:23 +08:00
commit 09f2f56d41
1 changed files with 1 additions and 1 deletions

@ -1 +1 @@
Subproject commit ec1b3ecbbe576d1a13b5a537df6f5c215d1fbaad
Subproject commit b075ab99af838f15a524a0506f068ac2dd1574f9