minggo 84a102edf8 merge v3.13.1 back to v3		2016-09-15 10:08:28 +08:00
..
jni	merge v3.13 back to v3	2016-08-29 11:57:13 +08:00
res	…
src/org/cocos2dx/lua	fix lua tempate error (#16377)	2016-08-17 16:09:48 +08:00
.gitignore	…
AndroidManifest.xml	set correct package name	2016-05-09 18:14:53 +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	…
project.properties	prevent restarting activity on some events (#16525)	2016-09-06 16:12:49 +08:00