andyque ef5d4ddf86 Merge remote-tracking branch 'upstream/v3' into v3 ... # Conflicts: # tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters		2015-07-14 11:24:38 +08:00
..
jni	Merge remote-tracking branch 'upstream/v3' into v3	2015-07-14 11:24:38 +08:00
res	Rename module	2015-05-18 15:01:20 +08:00
src/org/cocos2dx/cpp_tests	Rename module	2015-05-18 15:01:20 +08:00
.gitignore	Rename module	2015-05-18 15:01:20 +08:00
AndroidManifest.xml	Merged changes from "Vibrate support in v4" into v3 branch.	2015-06-26 01:02:44 +02: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