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/09 08:16:14 UTC
[5/8] 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/4cd60541
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4cd60541
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4cd60541
Branch: refs/heads/0.11-dev
Commit: 4cd60541a6f6a433ef129ddc4e2f011f4d7af4ce
Parents: 430cf12 18aa265
Author: acton393 <zh...@gmail.com>
Authored: Thu Mar 9 15:57:15 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Mar 9 15:57:15 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/bridge/WXBridgeManager.java | 53 ++++++++++++++------
.../xcshareddata/xcschemes/WeexDemo.xcscheme | 2 +-
.../Sources/Display/WXComponent+BoxShadow.h | 5 +-
.../Sources/Display/WXComponent+BoxShadow.m | 22 ++++----
.../WeexSDK/Sources/Events/WXComponent+Events.m | 4 ++
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 10 ++--
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 2 +-
.../Sources/View/WXComponent+ViewManagement.m | 2 +
package.json | 2 +-
9 files changed, 65 insertions(+), 37 deletions(-)
----------------------------------------------------------------------