pandamicro 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 ... # Conflicts: # .travis.yml # build/cocos2d_js_tests.xcodeproj/project.pbxproj # build/cocos2d_tests.xcodeproj/project.pbxproj # cocos/2d/CCFont.h # cocos/2d/CCFontAtlas.cpp # cocos/2d/CCFontAtlas.h # cocos/2d/CCFontFreeType.cpp # cocos/2d/CCFontFreeType.h # cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj # cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj # cocos/2d/libcocos2d_win10/libcocos2d.vcxproj # cocos/cocos2d.cpp # cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp # templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj # templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj # tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp # tests/cpp-tests/Classes/LabelTest/LabelTestNew.h # tools/bindings-generator # tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj # tools/travis-scripts/generate-bindings.sh # tools/travis-scripts/generate-cocosfiles.sh # tools/travis-scripts/travis_mac.yml		2015-08-02 22:28:27 +08:00
..
before-install.sh	[ci skip]update travis ci to use ndk-r9d	2014-07-03 11:02:04 +08:00
config.gitingore	Update the JS templates to keep the directory structure is same with before.	2015-07-14 18:07:17 +08:00
for-each-file-in-dir.sh	[travis ci] Adds 'for-each-file-in-dir.sh' for generating file list in cocos2d. CocosRobot will send a PR for that change.	2014-03-06 13:54:24 +08:00
generate-bindings.sh	Gen bindings and cocos2dx_files for v3.7.1	2015-07-25 13:31:52 +08:00
generate-cocosfiles.sh	Gen bindings and cocos2dx_files for v3.7.1	2015-07-25 13:31:52 +08:00
generate-template-files.py	Update the JS templates to keep the directory structure is same with before.	2015-07-14 18:07:17 +08:00
install_glfw.sh	issue #3823: install_glfw.sh will not skip if it was installed. Since it will not be updated if we find a new version of glfw.	2014-01-23 01:07:28 -08:00
run-script.sh	add v3 to travis build	2015-07-03 18:27:42 +08:00
travis_mac.yml	Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3	2015-08-02 22:28:27 +08:00