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/13 02:19:09 UTC
[4/6] incubator-weex git commit: Merge branch '0.12-dev' into
0.12-dev-feature-jsfm0.20.3
Merge branch '0.12-dev' into 0.12-dev-feature-jsfm0.20.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3fb44b03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3fb44b03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3fb44b03
Branch: refs/heads/0.12-dev
Commit: 3fb44b03582bac1e8ae06586caa0db6a44832b93
Parents: ca89012 c92617a
Author: atomtong <to...@qq.com>
Authored: Wed Apr 12 10:36:32 2017 +0800
Committer: atomtong <to...@qq.com>
Committed: Wed Apr 12 10:36:32 2017 +0800
----------------------------------------------------------------------
DISCLAIMER | 1 +
LICENSE | 2 +-
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 122 ++++++++++++++++++-
ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m | 6 +-
test/run.sh | 9 +-
test/scripts/components/recycler.test.js | 2 +-
6 files changed, 130 insertions(+), 12 deletions(-)
----------------------------------------------------------------------