minggo 602d34ec78 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20		2012-04-26 17:36:59 +08:00
..
Android.mk	issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug).	2012-04-25 16:18:04 +08:00
main.cpp	issue #931: refactor CCImage and CCTexture2D	2012-04-26 17:36:32 +08:00