You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/02/28 02:29:43 UTC
[03/50] incubator-weex git commit: Merge branch '0.11-dev' into
0.11-dev
Merge branch '0.11-dev' into 0.11-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/0a7ba306
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0a7ba306
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0a7ba306
Branch: refs/heads/0.11-dev
Commit: 0a7ba3068f68137101443b68b55372cd267d79d3
Parents: b1789f3 94d5649
Author: boboning <ni...@163.com>
Authored: Tue Feb 21 16:58:12 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Tue Feb 21 16:58:12 2017 +0800
----------------------------------------------------------------------
.travis.yml | 2 +
.../zxing/client/android/CaptureActivity.java | 1 +
.../com/taobao/weex/bridge/WXBridgeManager.java | 48 +-
.../main/java/com/taobao/weex/utils/WXHack.java | 527 -------------------
test/scripts/components/scroll-event.test.js | 4 +-
test/scripts/dom.test.js | 2 +-
test/scripts/index.test.js | 2 +-
7 files changed, 36 insertions(+), 550 deletions(-)
----------------------------------------------------------------------