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/03/17 07:11:38 UTC

[34/40] incubator-weex git commit: Merge branch '0.11-dev' of https://github.com/acton393/incubator-weex into 0.11-dev

Merge branch '0.11-dev' of https://github.com/acton393/incubator-weex 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/4c7ed690
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4c7ed690
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4c7ed690

Branch: refs/heads/0.12-dev
Commit: 4c7ed6903dad847d56ccb112a5aaac3b5fb9f633
Parents: 80ddeae 93038db
Author: cxfeng <cx...@apache.org>
Authored: Thu Mar 16 19:55:16 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Thu Mar 16 19:55:16 2017 +0800

----------------------------------------------------------------------
 .../Component/WXComponent+GradientColor.m       |  3 ++
 .../Sources/Component/WXScrollerComponent.m     |  6 +--
 .../WeexSDK/Sources/Layout/WXComponent+Layout.m |  4 ++
 .../WeexSDK/Sources/Module/WXAnimationModule.m  | 43 +++++++++++++++-----
 4 files changed, 42 insertions(+), 14 deletions(-)
----------------------------------------------------------------------