Huabing.Xu 84540c1ff4 Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering ... Conflicts: cocos/renderer/CCGLProgramCache.cpp tests/cpp-tests/Classes/controller.cpp		2015-05-14 11:55:10 +08:00
..
cocos2d_js_tests.xcodeproj	[js-tests]Fixed crash on iOS/Mac	2015-04-24 18:14:24 +08:00
cocos2d_libs.xcodeproj	Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering	2015-05-14 11:55:10 +08:00
cocos2d_tests.xcodeproj	Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering	2015-05-14 11:55:10 +08:00
android-build.py	only build c++ codes	2015-02-13 15:54:35 +08:00
cocos2d-js-win8.1-universal.sln	Modify the configuration about js-tests.	2015-05-06 10:52:23 +08:00
cocos2d-js-win32.vc2013.sln	add new files to project	2015-05-12 10:40:51 +08:00
cocos2d-win8.1-universal.sln	Remove vs2012 support in v3	2015-05-05 16:11:26 +08:00
cocos2d-win32.vc2013.sln	add physics3d support	2015-05-08 15:49:33 +08:00
install-deps-linux.sh	remove glfw2	2015-01-14 14:43:01 +08:00
win32-msvc-2013-x86.cmd	Setup for testing for every windows user	2013-11-30 09:36:22 +00:00