Merge commit '096c59b80aca8399f146639ede15a952757f495c' into 0.16-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/46b98bba Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/46b98bba Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/46b98bba Branch: refs/heads/0.16-dev Commit: 46b98bba98340527af92803c5064fcdb84527f34 Parents: 36ddf32 096c59b Author: gurisxie <279483...@qq.com> Authored: Mon Aug 14 12:48:04 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Mon Aug 14 12:48:04 2017 +0800 ---------------------------------------------------------------------- android/sdk/libs/x86/libweexjsc.so | Bin 7570392 -> 12121924 bytes doc/source/_posts/arkit.md | 112 +++++++++++++++++++ doc/source/_posts/cn/hello.md | 6 - doc/source/_posts/hello_world.md | 7 -- doc/source/_posts/test.md | 14 --- doc/source/cn/blog/index.md | 4 - .../cn/references/advanced/extend-to-ios.md | 4 +- .../advanced/integrate-devtool-to-android.md | 86 +++++++++++++- doc/source/cn/references/common-style.md | 2 + doc/source/cn/references/components/text.md | 4 +- doc/source/cn/references/modules/animation.md | 2 +- doc/source/references/advanced/extend-to-ios.md | 5 +- doc/source/references/common-style.md | 2 + doc/source/references/components/text.md | 4 +- doc/source/references/modules/animation.md | 2 +- doc/themes/weex/layout/_partial/header.ejs | 1 + .../weex/layout/_partial/post/summary.ejs | 1 + doc/themes/weex/source/css/blog.scss | 3 + doc/themes/weex/source/css/media-queries.scss | 1 + doc/themes/weex/source/css/partial/header.scss | 6 +- html5/runtime/normalize.js | 13 +-- .../WeexSDK/Sources/Component/WXListComponent.m | 4 +- package.json | 3 +- pre-build/native-bundle-main.js | 10 +- 24 files changed, 231 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/46b98bba/package.json ----------------------------------------------------------------------
