Skip to content

Commit 89c6848

Browse files
committed
Merge pull request cocos2d#2947 from pandamicro/develop
Update versions
2 parents 63fbf15 + e2a2d1b commit 89c6848

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

cocos2d/core/platform/CCConfig.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* @type {String}
3232
* @name cc.ENGINE_VERSION
3333
*/
34-
window["CocosEngine"] = cc.ENGINE_VERSION = "Cocos2d-JS v3.6";
34+
window["CocosEngine"] = cc.ENGINE_VERSION = "Cocos2d-JS v3.7 Beta0";
3535

3636
/**
3737
* <p>

tools/build.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
classpath="./compiler/compiler.jar"/>
66
<target name="compile">
77
<jscomp compilationLevel="simple" warning="quiet"
8-
debug="false" output="./../lib/cocos2d-js-v3.6-min.js">
9-
<!--sourceMapOutputFile="./../lib/cocos2d-js-v3.6-sourcemap" sourceMapFormat="V3" -->
8+
debug="false" output="./../lib/cocos2d-js-v3.7-min.js">
9+
<!--sourceMapOutputFile="./../lib/cocos2d-js-v3.7-sourcemap" sourceMapFormat="V3" -->
1010
<sources dir="./../">
1111
<file name="Base64Images.js"/>
1212
<file name="CCBoot.js"/>
@@ -300,8 +300,8 @@
300300

301301
<target name="compile_core">
302302
<jscomp compilationLevel="simple" warning="quiet"
303-
debug="false" output="./../lib/cocos2d-js-v3.6-core-min.js">
304-
<!--sourceMapOutputFile="./../lib/cocos2d-js-v3.6-core-sourcemap" sourceMapFormat="V3" -->
303+
debug="false" output="./../lib/cocos2d-js-v3.7-core-min.js">
304+
<!--sourceMapOutputFile="./../lib/cocos2d-js-v3.7-core-sourcemap" sourceMapFormat="V3" -->
305305
<sources dir="./../">
306306
<file name="CCBoot.js"/>
307307
<file name="cocos2d/core/platform/CCClass.js"/>

0 commit comments

Comments
 (0)