Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3		2015-05-25 17:01:29 +08:00
..
jni	Rename module	2015-05-18 15:01:20 +08:00
res	Rename module	2015-05-18 15:01:20 +08:00
src/org/cocos2dx/game_controller_test	Rename module	2015-05-18 15:01:20 +08:00
.gitignore	Rename module	2015-05-18 15:01:20 +08:00
AndroidManifest.xml	Rename module	2015-05-18 15:01:20 +08:00
build.gradle	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
proguard-rules.pro	Rename module	2015-05-18 15:01:20 +08:00
project.properties	Add the project.properties for the ndk-build of proj.android-studio.	2015-05-21 15:43:01 +08:00