Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tools/simulator/frameworks/runtime-src/proj.android
History
yinjimmy 0978a88b7f Merge branch 'v3' into combine 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk
	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
	templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
	templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
	tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj
 		2015-01-12 17:54:58 +08:00
..
.settings move simulator 2015-01-07 17:50:15 +08:00
assets add libsimulator 2015-01-08 14:10:28 +08:00
jni Merge branch 'v3' into combine 2015-01-12 17:54:58 +08:00
res move simulator 2015-01-07 17:50:15 +08:00
src/org/cocos2dx/lua move simulator 2015-01-07 17:50:15 +08:00
.classpath move simulator 2015-01-07 17:50:15 +08:00
.project move simulator 2015-01-07 17:50:15 +08:00
AndroidManifest.xml move simulator 2015-01-07 17:50:15 +08:00
ant.properties move simulator 2015-01-07 17:50:15 +08:00
build-cfg.json support android 2015-01-07 22:19:46 +08:00
build.xml move simulator 2015-01-07 17:50:15 +08:00
proguard-project.txt move simulator 2015-01-07 17:50:15 +08:00
project.properties support android 2015-01-07 22:19:46 +08:00