Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12441 from pandamicro/v3 

[ci skip] Update versions
This commit is contained in:
pandamicro 2015-06-19 09:56:51 +08:00
parent 28b4a20cfd 276ce3a0a7
commit 63e02ce4d9
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -38,7 +38,7 @@ endif()
project (Cocos2d-X)
# The version number
set(COCOS2D_X_VERSION 3.6)
set(COCOS2D_X_VERSION 3.7)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/Modules/")
include(CocosBuildHelpers)

2
cocos/cocos2d.cpp
View File

@ -31,7 +31,7 @@ NS_CC_BEGIN
CC_DLL const char* cocos2dVersion()
{
return "cocos2d-x 3.7-github";
return "cocos2d-x-3.7beta0";
}
NS_CC_END

2
cocos/scripting/js-bindings/manual/ScriptingCore.h
View File

@ -39,7 +39,7 @@
#include <assert.h>
#include <memory>
#define ENGINE_VERSION "Cocos2d-JS v3.6"
#define ENGINE_VERSION "Cocos2d-JS v3.7 Beta0"
void js_log(const char *format, ...);

2
cocos/scripting/js-bindings/script/jsb_cocos2d.js
View File

@ -26,7 +26,7 @@
// CCConfig.js
//
cc.ENGINE_VERSION = "Cocos2d-JS v3.6";
cc.ENGINE_VERSION = "Cocos2d-JS v3.7 Beta0";
cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0;
cc.DIRECTOR_STATS_POSITION = {x: 0, y: 0};

2
docs/doxygen.config
View File

@ -38,7 +38,7 @@ PROJECT_NAME = Cocos2d-x
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = v3.6
PROJECT_NUMBER = v3.7
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a

2
plugin

@ -1 +1 @@
Subproject commit 1fd5d8c9c117d57fbba60ab4b4880d726b3a8002
Subproject commit ad539b56c5354c1083f479d4c8d275ae8c7fdfa7

2
web

@ -1 +1 @@
Subproject commit 63fbf15f808918a3e5b1921a6cdf81888742817b
Subproject commit 89c6848eb777cbc8c8a5b138a3985d850899197c