James Chen 26763c200b Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform ... Conflicts: tests/proj.ios/test.xcodeproj/project.pbxproj		2012-04-24 15:44:53 +08:00
..
tests	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform	2012-04-24 15:44:53 +08:00
Android.mk	Refactored project folders.	2012-04-19 11:46:08 +08:00
Application.mk	Refactored project folders.	2012-04-19 11:46:08 +08:00