You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@weex.apache.org by xkli <gi...@git.apache.org> on 2017/03/27 07:05:08 UTC

[GitHub] incubator-weex pull request #167: Merge branch 'v0.10.0-playground' into 0.1...

GitHub user xkli opened a pull request:

    https://github.com/apache/incubator-weex/pull/167

    Merge branch 'v0.10.0-playground' into 0.11-dev

    @zshshr 

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/xkli/incubator-weex 0.11-playground

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/incubator-weex/pull/167.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #167
    
----
commit 93063f1425289e2b501a0bd821f5e1153e52849a
Author: xkli <56...@qq.com>
Date:   2017-03-27T06:58:56Z

    Merge branch 'v0.10.0-playground' into 0.11-dev
    
    * v0.10.0-playground:
      *[android] update app version 0.10.0
      *[android] update app version
      *[android] update example
      \u66f4\u65b0example
      *[android] update ic_launcher
      * [android] update app version
      * [android] update weex_inspector version
      * [android] add mask component
      * [android] update verison
      * [android] add linear-gradient.we
    
    # Conflicts:
    #	android/playground/app/build.gradle
    #	android/sdk/assets/main.js
    #	android/sdk/build.gradle
    #	examples/module/websocket-demo.we
    #	examples/vue/components/input.vue
    #	examples/vue/include/marquee.vue
    #	examples/vue/index.vue
    #	examples/vue/showcase/calculator.vue
    #	examples/vue/template.vue

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-weex pull request #167: Merge branch 'v0.10.0-playground' into 0.1...

Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:

    https://github.com/apache/incubator-weex/pull/167


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---