chengstory 8ae7ecff33 Merge branch 'develop' into #3457 ... Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj cocos/editor-support/cocostudio/CCSGUIReader.cpp cocos/editor-support/cocostudio/CCSGUIReader.h		2013-12-26 12:55:52 +08:00
..
cocos2d_libs.xcodeproj	Merge branch 'develop' into #3457	2013-12-26 12:55:52 +08:00
cocos2d_samples.xcodeproj	Merge branch 'develop' into #3457	2013-12-26 12:55:52 +08:00
BuildHelpers.CMakeLists.txt	issue #3113: Updating CMakeLists.txt, Improve Copying files.	2013-11-06 10:57:36 +08:00
android-build.py	support generate APK by script in template project and unify help message for usage.	2013-12-22 17:48:35 +08:00
build-mingw32-gcc-make.sh	added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors	2013-12-05 03:37:27 +00:00
cocos2d-win32.vc2012.sln	bind gui and studio.	2013-11-18 16:54:52 +08:00
install-deps-linux.sh	issue #2905:samples build ok on linux	2013-10-22 18:01:56 +08:00
win32-msvc-2010-x86.cmd	Setup for testing for every windows user	2013-11-30 09:36:22 +00: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