Huabing.Xu 10352c40b2 Merge branch 'v3' into v3FrameBufferObject ... # Conflicts: # cocos/2d/CCCamera.h		2015-06-10 10:16:42 +08:00
..
cocos2d_js_tests.xcodeproj	add copy recourse path in mac from js-test rests	2015-05-27 10:19:01 +08:00
cocos2d_libs.xcodeproj	file rename CCFrameBufferObject->CCFrameBuffer	2015-06-09 15:32:12 +08:00
cocos2d_tests.xcodeproj	Merge pull request #12049 from samuele3hu/v3_material	2015-05-27 16:26:26 +08:00
android-build.py	add JSB to jenkins	2015-05-25 16:37:08 +08:00
cocos2d-js-win8.1-universal.sln	added libbullet to Windows 8.1 Universal App projects	2015-05-20 08:01:01 -07:00
cocos2d-js-win32.sln	Rename solution file for Win32 project.	2015-05-20 13:55:23 +08:00
cocos2d-win8.1-universal.sln	added libbullet to Windows 8.1 Universal App projects	2015-05-20 08:01:01 -07:00
cocos2d-win10.sln	added Windows 10 UWP project files	2015-05-28 13:51:25 -07:00
cocos2d-win32.sln	Rename solution file for Win32 project.	2015-05-20 13:55:23 +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