htl 194fa09f30 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin		2015-01-07 14:14:52 +08:00
..
auto	[AUTO]: updating luabinding automatically	2015-01-07 02:27:01 +00:00
manual	issue #9796: Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit	2015-01-05 17:10:25 +08:00
proj.android	Resolve the project setting error on the platforms	2014-11-27 19:42:32 +08:00
proj.ios_mac/cocos2d_lua_bindings.xcodeproj	Decrease the package size of lua_empty_test	2014-11-26 21:54:18 +08:00
proj.win32	Resolve the project setting error on the platforms	2014-11-27 19:42:32 +08:00
script	modify texture format name	2015-01-07 14:11:48 +08:00
CMakeLists.txt	Resolve the project setting error on the platforms	2014-11-27 19:42:32 +08:00