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

Merge pull request #14733 from xiaofeng11/v3.10 

Update h5 sub-module ref
This commit is contained in:
xiaofeng11 2015-12-18 19:06:59 +08:00
parent e2f94a7a44 9253570304
commit 2ee5c88f9a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/scripting/js-bindings/script/studio/parsers/action-1.x.js
View File

@ -233,6 +233,6 @@
});
});
load.registerParser("action", "*", parser);
load.registerParser("action", "1.*", parser);
})(ccs._load, ccs._parser);

2
cocos/scripting/js-bindings/script/studio/parsers/action-2.x.js
View File

@ -310,6 +310,6 @@
});
});
load.registerParser("action", "2.*", parser);
load.registerParser("action", "*", parser);
})(ccs._load, ccs._parser);

2
web

@ -1 +1 @@
Subproject commit 1fb1d53dee1893dbec0012f1bbdad957e25c355a
Subproject commit f91d7a39e72c271e6e87ea269e2428c00f3c07cc