samuele3hu a47e52b5bc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module ... Conflicts: build/cocos2d_tests.xcodeproj/project.pbxproj		2014-07-31 15:22:46 +08:00
..
auto	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module	2014-07-31 15:22:46 +08:00
manual	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module	2014-07-31 15:22:46 +08:00
proj.ios_mac/cocos2d_lua_bindings.xcodeproj	Split luabindings module to some independent modules	2014-07-31 15:20:23 +08:00
proj.win32	change cocos2d to libcocos2d for windows	2014-07-28 20:55:58 +08:00
script	Update the FastTileMapTest and VideoPlayerTest	2014-07-17 12:55:28 +08:00
Android.mk	Merge pull request #7518 from natural-law/android-dependencies	2014-07-18 17:57:42 +08:00
CMakeLists.txt	Update experimental lua bindings、related test cases and project setting	2014-07-17 14:54:34 +08:00