You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/04/11 06:38:43 UTC
[12/18] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.12-dev' into 0.12-dev
Merge remote-tracking branch 'upstream/0.12-dev' into 0.12-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c18fc984
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c18fc984
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c18fc984
Branch: refs/heads/0.12-dev
Commit: c18fc984c8f8e748ad40bd4ff49fcbc13d6b9580
Parents: e2252c5 c597a05
Author: acton393 <zh...@gmail.com>
Authored: Thu Apr 6 19:17:33 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Apr 6 19:17:33 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/WXSDKInstance.java | 10 +++--
html5/frameworks/legacy/app/ctrl/init.js | 42 +++++++++++++++++---
package.json | 2 +-
3 files changed, 44 insertions(+), 10 deletions(-)
----------------------------------------------------------------------