chuanweizhang2013 7f75b58acf Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime ... Conflicts: templates/lua-template-runtime/cocos-project-template.json		2014-06-23 17:30:33 +08:00
..
HelloLua.xcodeproj	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime	2014-06-23 17:30:33 +08:00
ios	add suport ios screen orientation set	2014-05-07 20:50:29 +08:00
mac	add play ui	2014-05-22 11:52:49 +08:00
Runtime_ios-mac.mm	add runtime template	2014-03-11 16:52:06 +08:00