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

Update engine version

This commit is contained in:
pandamicro 2016-04-07 22:36:29 +08:00 committed by minggo
parent f450405d4e
commit bb2cfc7308
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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 # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = v3.10 PROJECT_NUMBER = v3.11
# Using the PROJECT_BRIEF tag one can provide an optional one line description # 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 # for a project that appears at the top of each page and should give viewer a

2
tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/Info.plist
View File

@ -41,7 +41,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.10</string> <string>3.11</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>

2
tools/simulator/frameworks/runtime-src/proj.win32/game.rc
View File

@ -64,7 +64,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
CAPTION "About Simulator" CAPTION "About Simulator"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
CTEXT "Version 3.10 (20151222)",IDC_ABOUT_VERSION,35,70,173,17 CTEXT "Version 3.11 (20160330)",IDC_ABOUT_VERSION,35,70,173,17
CTEXT "Cocos Simulator",IDC_ABOUT_TITLE,35,49,173,17 CTEXT "Cocos Simulator",IDC_ABOUT_TITLE,35,49,173,17
CTEXT "Copyright (C) 2015. All rights reserved.",IDC_STATIC,35,94,173,17 CTEXT "Copyright (C) 2015. All rights reserved.",IDC_STATIC,35,94,173,17
ICON "GLFW_ICON",IDC_STATIC,111,15,20,20 ICON "GLFW_ICON",IDC_STATIC,111,15,20,20

2
web

@ -1 +1 @@
Subproject commit 8586470e65d43f60b06d2846bde72b384e884e5d Subproject commit 9363587d5c95d941e25683390a3177983c4a031f