samuele3hu 067ad6ad60 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_studio2 ... Conflicts: cocos/scripting/lua-bindings/proj.android/Android.mk cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj		2015-04-20 10:05:02 +08:00
..
cpp-empty-test	removed WP8 project files	2015-04-15 07:13:54 -07:00
cpp-tests	Merge pull request #11465 from WenhaiLin/v3-videoplayer-iosfix	2015-04-16 18:16:28 +08:00
game-controller-test	Fixed game controller test can't compile by cocos command	2015-01-28 17:37:31 +08:00
lua-empty-test	Modify MSVC project files to build executables in subfolders and properly copy resources to that subfolders.	2015-02-10 16:23:34 +03:00
lua-game-controller-test	Fixed compiling and linking error of lua tests when using NDK r10 above.	2014-11-27 13:56:15 +08:00
lua-tests	Add Lua bindings for WebView and related test case	2015-04-17 14:08:47 +08:00