andyque 5624da5448 Merge branch 'v3' into cleanupBinaryLoader ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/editor-support/cocostudio/CCSGUIReader.h cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters		2014-06-23 09:37:39 +08:00
..
cocos2d_libs.xcodeproj	Merge branch 'v3' into cleanupBinaryLoader	2014-06-23 09:37:39 +08:00
cocos2d_tests.xcodeproj	Merge branch 'v3' into cleanupBinaryLoader	2014-06-23 09:37:39 +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	lua template & android-build.py updated	2014-05-20 13:49:02 +04: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	[win32] HelloCpp -> cpp-empty-test, HelloLua -> lua-empty-test.	2014-03-12 15:59:48 +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