From a13a0c35d3e7786e87d6b0a854e71576850cdd51 Mon Sep 17 00:00:00 2001
From: XiaoFeng <xiaofeng@chukong-inc.com>
Date: Fri, 18 Dec 2015 15:40:21 +0800
Subject: [PATCH 1/2] Update h5 sub-module ref Synchronize studio parser match
 change from h5 modify

---
 cocos/scripting/js-bindings/script/studio/parsers/action-1.x.js | 2 +-
 cocos/scripting/js-bindings/script/studio/parsers/action-2.x.js | 2 +-
 web                                                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cocos/scripting/js-bindings/script/studio/parsers/action-1.x.js b/cocos/scripting/js-bindings/script/studio/parsers/action-1.x.js
index 6bcebf2734..b03e849210 100644
--- a/cocos/scripting/js-bindings/script/studio/parsers/action-1.x.js
+++ b/cocos/scripting/js-bindings/script/studio/parsers/action-1.x.js
@@ -233,6 +233,6 @@
         });
     });
 
-    load.registerParser("action", "*", parser);
+    load.registerParser("action", "1.*", parser);
 
 })(ccs._load, ccs._parser);
diff --git a/cocos/scripting/js-bindings/script/studio/parsers/action-2.x.js b/cocos/scripting/js-bindings/script/studio/parsers/action-2.x.js
index 9a7dece156..76f284286f 100644
--- a/cocos/scripting/js-bindings/script/studio/parsers/action-2.x.js
+++ b/cocos/scripting/js-bindings/script/studio/parsers/action-2.x.js
@@ -310,6 +310,6 @@
         });
     });
 
-    load.registerParser("action", "2.*", parser);
+    load.registerParser("action", "*", parser);
 
 })(ccs._load, ccs._parser);
diff --git a/web b/web
index 1fb1d53dee..f723c34bd3 160000
--- a/web
+++ b/web
@@ -1 +1 @@
-Subproject commit 1fb1d53dee1893dbec0012f1bbdad957e25c355a
+Subproject commit f723c34bd3a9474d572cf29b7d4f43f8ba2a2eee

From 92535703043c8e72f4fd7b25be21d96096817538 Mon Sep 17 00:00:00 2001
From: XiaoFeng <xiaofeng@chukong-inc.com>
Date: Fri, 18 Dec 2015 17:32:44 +0800
Subject: [PATCH 2/2] update h5 sub-module ref

---
 web | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web b/web
index f723c34bd3..f91d7a39e7 160000
--- a/web
+++ b/web
@@ -1 +1 @@
-Subproject commit f723c34bd3a9474d572cf29b7d4f43f8ba2a2eee
+Subproject commit f91d7a39e72c271e6e87ea269e2428c00f3c07cc