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
..
gen/org/cocos2dx/tests	issue #1177: Updated android project configuration.	2012-04-20 17:33:28 +08:00
jni	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform	2012-04-24 15:44:53 +08:00
res	Refactored project folders.	2012-04-19 11:46:08 +08:00
src/org/cocos2dx	Refactored project folders.	2012-04-19 11:46:08 +08:00
AndroidManifest.xml	Refactored project folders.	2012-04-19 11:46:08 +08:00
build_native.sh	add execution permission	2012-04-20 10:54:58 +08:00
project.properties	Refactored project folders.	2012-04-19 11:46:08 +08:00