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
..
auto	[AUTO]: updating luabinding automatically	2014-06-19 13:24:36 +00:00
manual	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime	2014-06-23 17:30:33 +08:00
proj.ios_mac/cocos2d_lua_bindings.xcodeproj	Remove the debug symbols for release mode in xcode projects.	2014-06-18 17:06:56 +08:00
proj.win32	Optimize the win32 projects configuration.	2014-06-20 10:50:43 +08:00
script	Add deprecated support for the related UI addEventListener functions	2014-06-12 12:02:22 +08:00
Android.mk	Adjust the xxtea directory structure and modify configs files for platforms	2014-06-04 11:50:04 +08:00
CMakeLists.txt	Adjust the xxtea directory structure and modify configs files for platforms	2014-06-04 11:50:04 +08:00