From 31c397cb0c60d923f49ac056d0fd6e28b02110be Mon Sep 17 00:00:00 2001
From: VisualSJ <itharbors@outlook.com>
Date: Wed, 1 Apr 2015 14:34:38 +0800
Subject: [PATCH 1/2] Update build.xml

---
 tools/build.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/build.xml b/tools/build.xml
index 0f5b80ac2f..29c6abadb1 100644
--- a/tools/build.xml
+++ b/tools/build.xml
@@ -5,8 +5,8 @@
              classpath="./compiler/compiler.jar"/>
     <target name="compile">
         <jscomp compilationLevel="simple" warning="quiet"
-                debug="false" output="./../lib/cocos2d-js-v3.4-min.js">
-            <!--sourceMapOutputFile="./../lib/cocos2d-js-v3.3-beta0-sourcemap" sourceMapFormat="V3" -->
+                debug="false" output="./../lib/cocos2d-js-v3.5-min.js">
+            <!--sourceMapOutputFile="./../lib/cocos2d-js-v3.5-sourcemap" sourceMapFormat="V3" -->
             <sources dir="./../">
                 <file name="Base64Images.js"/>
                 <file name="CCBoot.js"/>
@@ -298,8 +298,8 @@
 
     <target name="compile_core">
         <jscomp compilationLevel="simple" warning="quiet"
-                debug="false" output="./../lib/cocos2d-js-v3.4-core-min.js">
-            <!--sourceMapOutputFile="./../lib/cocos2d-js-v3.3-beta0-core-sourcemap" sourceMapFormat="V3" -->
+                debug="false" output="./../lib/cocos2d-js-v3.5-core-min.js">
+            <!--sourceMapOutputFile="./../lib/cocos2d-js-v3.5-core-sourcemap" sourceMapFormat="V3" -->
             <sources dir="./../">
                 <file name="CCBoot.js"/>
                 <file name="cocos2d/core/platform/CCClass.js"/>

From 2354cc8e111bc7092f8380aed644dcc6f2ab52b0 Mon Sep 17 00:00:00 2001
From: VisualSJ <itharbors@outlook.com>
Date: Wed, 1 Apr 2015 14:36:40 +0800
Subject: [PATCH 2/2] Fixed a bug that scheduleUpdate error when
 cc.ActionManager is null

---
 cocos2d/core/CCDirector.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cocos2d/core/CCDirector.js b/cocos2d/core/CCDirector.js
index 02141cbda5..cd84958624 100644
--- a/cocos2d/core/CCDirector.js
+++ b/cocos2d/core/CCDirector.js
@@ -154,8 +154,12 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
         //scheduler
         this._scheduler = new cc.Scheduler();
         //action manager
-        this._actionManager = cc.ActionManager ? new cc.ActionManager() : null;
-        this._scheduler.scheduleUpdate(this._actionManager, cc.Scheduler.PRIORITY_SYSTEM, false);
+        if(cc.ActionManager){
+            this._actionManager = new cc.ActionManager();
+            this._scheduler.scheduleUpdate(this._actionManager, cc.Scheduler.PRIORITY_SYSTEM, false);
+        }else{
+            this._actionManager = null;
+        }
 
         this._eventAfterDraw = new cc.EventCustom(cc.Director.EVENT_AFTER_DRAW);
         this._eventAfterDraw.setUserData(this);