You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/09/21 12:16:21 UTC
[13/14] incubator-weex git commit: Merge commit
'eeaa5e0bd24a580dcbf1ab6cec4c13f2f9718d63' into doc-merge-dev
Merge commit 'eeaa5e0bd24a580dcbf1ab6cec4c13f2f9718d63' into doc-merge-dev
finish Conflicts:
doc/source/cn/references/common-style.md
doc/source/references/common-style.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e42de911
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e42de911
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e42de911
Branch: refs/heads/0.16-dev
Commit: e42de9110e6b190901ac28e3ad57d17d4b9e8b72
Parents: 8325077 eeaa5e0
Author: gurisxie <27...@qq.com>
Authored: Thu Sep 21 17:56:13 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Thu Sep 21 17:56:13 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/index.md | 9 ++++++---
doc/source/cn/guide/set-up-env.md | 4 ++--
doc/source/cn/guide/tools/toolkit.md | 2 +-
.../cn/references/advanced/extend-to-android.md | 21 ++++++++++++++++++--
doc/source/cn/references/common-style.md | 1 +
doc/source/cn/references/components/text.md | 6 +++---
doc/source/cn/references/modules/animation.md | 2 ++
doc/source/cn/references/modules/dom.md | 2 +-
doc/source/guide/index.md | 4 ++--
doc/source/guide/set-up-env.md | 6 +++---
doc/source/guide/tools/toolkit.md | 5 ++---
doc/source/references/common-style.md | 1 +
doc/source/references/components/text.md | 8 ++++----
doc/source/references/modules/animation.md | 3 ++-
doc/source/references/modules/dom.md | 2 +-
.../WeexSDK/Sources/Component/WXWebComponent.m | 1 +
16 files changed, 51 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e42de911/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
----------------------------------------------------------------------