5 Commits

Author	SHA1	Message	Date
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
yinjimmy	d2a3a6a8c0	merge lua-template-default with lua-template-runtime	2015-01-09 04:08:41 +08:00
yinjimmy	82f37fcf72	add libsimulator	2015-01-08 14:10:28 +08:00
yinjimmy	f1f4e5f3c2	support android	2015-01-07 22:19:46 +08:00
yinjimmy	9122e15f2c	move simulator	2015-01-07 17:50:15 +08:00