samuele3hu 0daa30419b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module ... Conflicts: cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp tools/tolua/cocos2dx.ini		2014-08-06 00:37:19 +08:00
..
cocos2d_libs.xcodeproj	merge cocos2d, fix lua	2014-08-04 12:07:27 +08:00
cocos2d_tests.xcodeproj	Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates	2014-08-04 17:11:57 +08:00
winrt	added building wp8 shaders instructions	2014-06-20 09:12:16 -07:00
BuildHelpers.CMakeLists.txt	issue #3113: Updating CMakeLists.txt, Improve Copying files.	2013-11-06 10:57:36 +08:00
android-build.py	Add Lua bindings for controller and related test case project	2014-07-09 18:05:02 +08:00
build-mingw32-clang-make.sh	Added clang support for Mingw64	2014-01-11 13:26:04 +00:00
build-mingw32-gcc-make.sh	Added clang support for Mingw64	2014-01-11 13:26:04 +00:00
cocos2d-win32.vc2012.sln	Delte liblua project for win32 and adjust cocos2d-win32 project	2014-08-06 00:26:02 +08:00
cocos2d-wp8.vc2012.sln	updated pch file for wp8	2014-05-20 10:06:24 -07:00
install-deps-linux.sh	[Linux] Installs libssl-dev package.	2014-02-13 10:08:03 +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