You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ta...@apache.org on 2017/06/20 02:56:35 UTC

[15/15] incubator-weex git commit: Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into dev

Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 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/52ad0d7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/52ad0d7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/52ad0d7f

Branch: refs/heads/dev
Commit: 52ad0d7f8116432d404d798ed2feed32fb2d3eef
Parents: 25d52bd 4ef5368
Author: tancy <ro...@gmail.com>
Authored: Tue Jun 20 10:35:09 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Tue Jun 20 10:35:09 2017 +0800

----------------------------------------------------------------------
 .travis.yml                                     |  91 ++-
 android/sdk/build.gradle                        |   9 +-
 android/sdk/libs/armeabi/libweexjsc.so          | Bin 7566292 -> 7570392 bytes
 android/sdk/libs/x86/libweexjsc.so              | Bin 4545544 -> 12121924 bytes
 .../ui/component/AbstractEditComponent.java     |  33 +-
 doc/_config_cn.yml                              | 326 +++++++++
 doc/source/cn/releasenote.md                    | 663 ++-----------------
 doc/source/faq.md                               |   4 +-
 doc/source/releasenote.md                       | 663 ++-----------------
 .../Sources/Component/WXCycleSliderComponent.m  |   7 +-
 test/ci-funcs.sh                                |  18 -
 test/screenshot/border-ios.png                  | Bin 128206 -> 126185 bytes
 12 files changed, 500 insertions(+), 1314 deletions(-)
----------------------------------------------------------------------