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/24 10:06:23 UTC
[13/13] incubator-weex git commit: Merge branch '0.11-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev
Merge branch '0.11-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-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/e5786738
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e5786738
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e5786738
Branch: refs/heads/0.12-dev
Commit: e578673850ca61e3e6e0fbdd3df6ef093dd706f7
Parents: a8316d7 66aeba2
Author: sospartan <so...@apache.org>
Authored: Fri Mar 24 18:05:32 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Fri Mar 24 18:05:32 2017 +0800
----------------------------------------------------------------------
.../ui/component/list/BasicListComponent.java | 2 +-
html5/frameworks/legacy/app/ctrl/init.js | 2 +
html5/shared/freeze.js | 47 ++++++++++++--------
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.h | 2 +-
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 2 +-
.../Sources/Component/WXRefreshComponent.m | 2 +-
.../Sources/Component/WXSliderComponent.m | 6 +--
package.json | 2 +-
8 files changed, 39 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e5786738/package.json
----------------------------------------------------------------------