axmol/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac
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
..
HelloLua.xcodeproj Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases. 2014-08-27 10:18:44 +08:00
ios OpenGL context attributions setting revise -modify lua template 2014-08-25 10:57:58 +08:00
mac Modify lua-template-default and lua-template-runtime project 2014-08-07 13:54:54 +08:00
Runtime_ios-mac.mm modify mac out file 2014-06-25 19:33:38 +08:00