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/03/29 12:13:47 UTC
[20/39] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
Merge remote-tracking branch 'upstream/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/014cfc1f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/014cfc1f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/014cfc1f
Branch: refs/heads/0.12-dev
Commit: 014cfc1fa658c8d661ca888bc8310f76df27d0c8
Parents: be02dec 20ee586
Author: \u9690\u98ce <cx...@apache.org>
Authored: Tue Mar 28 00:34:55 2017 +0800
Committer: \u9690\u98ce <cx...@apache.org>
Committed: Tue Mar 28 00:34:55 2017 +0800
----------------------------------------------------------------------
.../bundlejs/vue/components/waterfall.js | 873 +++++++++++++++++++
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.m | 40 +-
2 files changed, 910 insertions(+), 3 deletions(-)
----------------------------------------------------------------------