You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/03/02 03:31:29 UTC

[14/14] incubator-weex git commit: Merge branch 'dev' of github.com:alibaba/weex into dev

Merge branch 'dev' of github.com:alibaba/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/ba53882d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ba53882d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ba53882d

Branch: refs/heads/dev
Commit: ba53882da021a37106c362bb49cba87bf36cb6fe
Parents: de4286a 4733936
Author: sospartan <so...@gmail.com>
Authored: Thu Mar 2 11:30:46 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Thu Mar 2 11:30:46 2017 +0800

----------------------------------------------------------------------
 examples/module/websocket-demo.we             | 88 ++++++++++++----------
 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m |  4 +-
 ios/sdk/WeexSDK/Sources/Utility/WXUtility.m   | 16 +++-
 3 files changed, 64 insertions(+), 44 deletions(-)
----------------------------------------------------------------------