Huabing.Xu feec24e3ef Merge branch 'v3' into develop_migrate_math_lib_merge ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/CCNode.cpp cocos/2d/CCRenderTexture.cpp cocos/2d/platform/wp8/CCGLView.h cocos/physics/CCPhysicsBody.cpp extensions/physics-nodes/CCPhysicsSprite.cpp extensions/physics-nodes/CCPhysicsSprite.h tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp		2014-04-25 16:20:24 +08:00
..
cocos2d_libs.xcodeproj	Merge branch 'v3' into develop_migrate_math_lib_merge	2014-04-25 16:20:24 +08:00
cocos2d_tests.xcodeproj	Merge branch 'v3' into develop_migrate_math_lib_merge	2014-04-25 16:20:24 +08:00
winrt	added missing files	2014-04-19 10:11:18 -07:00
BuildHelpers.CMakeLists.txt	issue #3113: Updating CMakeLists.txt, Improve Copying files.	2013-11-06 10:57:36 +08:00
android-build.py	Fixed copying resource fails in empty-lua-test.	2014-04-01 20:06:43 +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	[win32] HelloCpp -> cpp-empty-test, HelloLua -> lua-empty-test.	2014-03-12 15:59:48 +08:00
cocos2d-wp8.vc2012.sln	added missing files	2014-04-19 09:32:12 -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