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

This commit is contained in:
James Chen 2012-05-29 17:13:21 +08:00
commit 1ddb5d51b5
4 changed files with 4 additions and 4 deletions

View File

@ -1 +1 @@
6463956a32bf45c476904160aa23da947b30e0c1
842462907b895bea8fcf8fc4a567560e546e440f

View File

@ -1 +1 @@
4573789c928b734a05fb2766677b230a8a497ee5
c7a3fbb2c6d8e698889720796681db135c37b25b

View File

@ -1 +1 @@
1fcdddcfce3211d3619ee0dca4e1a51eec64aeeb
a330c09f123bd8de33522f7dedde5def5ea256a6

View File

@ -1 +1 @@
eaefdfe660bab51645c3729f121ee363934cda46
6a7a307611b24e912fd48f6075ceab240a16305a