axmol/templates/lua-template-runtime/frameworks/runtime-src/proj.android
chuanweizhang2013 7f75b58acf Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
Conflicts:
	templates/lua-template-runtime/cocos-project-template.json
2014-06-23 17:30:33 +08:00
..
.settings add runtime template 2014-03-11 16:52:06 +08:00
jni Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-06-23 17:30:33 +08:00
res issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
src/org/cocos2dx/lua add java nativeIsDebug 2014-05-20 13:53:52 +08:00
.classpath add runtime template 2014-03-11 16:52:06 +08:00
.project add runtime template 2014-03-11 16:52:06 +08:00
AndroidManifest.xml fixed can't move app to SD card after installed on android. 2014-06-17 12:03:20 +08:00
ant.properties add runtime template 2014-03-11 16:52:06 +08:00
build-cfg.json modify runtime folder 2014-05-30 11:00:26 +08:00
build.xml add runtime template 2014-03-11 16:52:06 +08:00
proguard-project.txt add runtime template 2014-03-11 16:52:06 +08:00
project.properties Squashed commit of the following: 2014-05-16 14:36:00 -07:00