geron-cn 0b09fd5bcb Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1 ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h		2015-07-24 11:38:09 +08:00
..
cocos2d_js_tests.xcodeproj	Fixed compile error	2015-07-17 11:34:26 +08:00
cocos2d_libs.xcodeproj	Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1	2015-07-24 11:38:09 +08:00
cocos2d_tests.xcodeproj	Label:support font that contains GB2312 char map.[except android]	2015-07-16 17:10:05 +08:00
android-build.py	add JSB to jenkins	2015-05-25 16:37:08 +08:00
cocos2d-js-win8.1-universal.sln	configure recast project for win8.1 project(js)	2015-06-03 14:42:37 +08:00
cocos2d-js-win32.sln	add recast to js project	2015-06-03 11:45:49 +08:00
cocos2d-win8.1-universal.sln	configure recast project for win8.1 project	2015-06-03 14:31:12 +08:00
cocos2d-win10.sln	added librecast	2015-06-15 18:18:54 -07:00
cocos2d-win32.sln	add 3d navigation	2015-05-29 16:45: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