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-runtime/frameworks/runtime-src/Classes
History
chuanweizhang2013 688ad1b3b9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 
Conflicts:
	templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp
	templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm
 		2014-08-28 10:28:31 +08:00
..
protobuf-lite add support x86 atomicops_internals_x86_gcc 2014-07-15 17:40:43 +08:00
runtime Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-08-28 10:28:31 +08:00
AppDelegate.cpp OpenGL context attributions setting revise -modify lua template 2014-08-25 10:57:58 +08:00
AppDelegate.h OpenGL context attributions setting revise -modify lua template 2014-08-25 10:57:58 +08:00
ConfigParser.cpp add config window top support 2014-07-24 10:30:39 +08:00
ConfigParser.h add config window top support 2014-07-24 10:30:39 +08:00
VisibleRect.cpp fix build error 2014-05-17 11:30:07 +08:00
VisibleRect.h fix build error 2014-05-17 11:30:07 +08:00
lua_module_register.h Add register_cocos3d_module for lua template 2014-08-18 19:46:11 +08:00