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
..
cocos2d_libs.xcodeproj	remove unneeded wp8 related files	2015-04-16 17:45:15 +08:00
cocos2d_tests.xcodeproj	Add Lua bindings for WebView and related test case	2015-04-17 14:08:47 +08:00
android-build.py	only build c++ codes	2015-02-13 15:54:35 +08:00
cocos2d-win8.1-universal.sln	removed unused winrt CCPlatformDefine.h	2014-12-30 21:03:33 -08:00
cocos2d-win32.vc2012.sln	Remove '-' character	2014-10-11 15:53:09 +08:00
install-deps-linux.sh	remove glfw2	2015-01-14 14:43:01 +08:00
win32-msvc-2012-x86.cmd	Setup for testing for every windows user	2013-11-30 09:36:22 +00:00
win32-msvc-2013-x86.cmd	Setup for testing for every windows user	2013-11-30 09:36:22 +00:00