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
..
.gitignore	fix conflicts	2013-10-12 11:31:32 +08:00
CODING_STYLE.md	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
CONTRIBUTE.md	[ci skip]	2014-12-04 15:47:05 +08:00
Groups.h	issue #12078: renamed platform to platform specific.	2015-06-15 10:46:09 +08:00
MainPage.h	Add MainPageWhiteBook.h, and move doxygen_modules.h to docs.	2015-03-19 20:21:40 +08:00
MainPageWhiteBook.h	fix about content	2015-03-27 16:18:28 +08:00
RELEASE_ENGINEERING.md	renamed RELEASING_RULES to RELEASE ENGINEERING	2014-11-11 14:09:08 -08:00
RELEASE_NOTES.md	Update release docs for v3.7	2015-07-21 09:49:41 +08:00
cocos2dx_portrait.png	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
doxygen.config	Release docs for v3.7.1	2015-07-25 15:16:39 +08:00
doxygen_white_book.config	Merge pull request #11200 from samuele3hu/v3_5_comment	2015-03-27 17:08:26 +08:00
framework_architecture.jpg	Modify name of engine in architecture graph	2015-07-29 10:05:01 +08:00
img-cocos.jpg	Add MainPageWhiteBook.h, and move doxygen_modules.h to docs.	2015-03-19 20:21:40 +08:00