You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by kf...@apache.org on 2017/07/13 07:25:18 UTC

[2/2] incubator-weex git commit: Merge branch '0.15-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-api-0.15-dev

Merge branch '0.15-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-api-0.15-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/ed650419
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ed650419
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ed650419

Branch: refs/heads/0.15-dev
Commit: ed6504196ec0a7b762f7aaa16870da91acea5920
Parents: 81d6488 3d97c00
Author: 齐山 <su...@163.com>
Authored: Thu Jul 13 15:24:47 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Thu Jul 13 15:24:47 2017 +0800

----------------------------------------------------------------------
 .../Sources/Component/WXCycleSliderComponent.m  |  6 ++++
 .../WeexSDK/Sources/Component/WXEditComponent.m |  2 +-
 ios/sdk/WeexSDK/Sources/Component/WXTransform.m |  8 +++---
 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m   |  4 +--
 .../WeexSDK/Sources/Module/WXAnimationModule.m  | 14 +++++++++-
 ios/sdk/WeexSDKTests/WXAnimationModuleTests.m   | 29 ++++++++++++++++++++
 6 files changed, 55 insertions(+), 8 deletions(-)
----------------------------------------------------------------------