samuele3hu ee4e5e4800 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix		2014-05-14 14:45:15 +08:00
..
auto	[AUTO]: updating luabinding automatically	2014-05-14 02:03:18 +00:00
manual	fixed deprecation warnings	2014-05-08 16:42:36 -07:00
proj.ios_mac/cocos2d_lua_bindings.xcodeproj	fix the compile error in Xcode 4.6 for mac platform which trigger by the Architectures’ value	2014-05-14 14:43:10 +08:00
proj.win32	upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).	2014-05-07 17:41:04 +03:00
script	add deprecated alias cc.VERTEX_ATTRIB_TEX_COORDS	2014-05-09 22:04:19 -07:00
Android.mk	Moves cocos/2d/Android.mk to cocos/Android.mk	2014-05-01 14:09:26 -07:00
CMakeLists.txt	fix lua bindings	2014-03-11 21:36:00 +08:00