Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/templates/lua-template-default
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 update lua default template 2015-01-09 13:21:19 +08:00
frameworks Merge branch 'v3' into combine 2015-01-12 17:54:58 +08:00
res update lua-default-template 2014-12-29 05:51:49 +08:00
runtime update lua default template 2015-01-09 13:21:19 +08:00
src add Cocos Studio support 2014-12-29 13:41:21 +08:00
.project update lua default template 2015-01-09 13:21:19 +08:00
cocos-project-template.json merge lua-template-default with lua-template-runtime 2015-01-09 04:08:41 +08:00
config.json add config.json 2015-01-09 11:43:41 +08:00