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/23 02:03:05 UTC

[1/4] incubator-weex git commit: [ios] fix wrong spelling caused compile error on Xcode version 8.2.1(8C1002)

Repository: incubator-weex
Updated Branches:
  refs/heads/dev 8fa5c936a -> 014aa8183


[ios] fix wrong spelling caused compile error on Xcode version 8.2.1(8C1002)


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/56b1df4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/56b1df4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/56b1df4c

Branch: refs/heads/dev
Commit: 56b1df4c03163c9a67d4df712ad84decdabe62f6
Parents: 6e71437
Author: \u6728\u74dc <mu...@uoko.com>
Authored: Thu Mar 16 16:39:50 2017 +0800
Committer: \u6728\u74dc <mu...@uoko.com>
Committed: Thu Mar 16 16:39:50 2017 +0800

----------------------------------------------------------------------
 ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/56b1df4c/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h b/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h
index ba4846d..851194d 100644
--- a/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h
+++ b/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h
@@ -7,7 +7,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "WXSDkInstance.h"
+#import "WXSDKInstance.h"
 
 typedef NS_ENUM(int, WXSDKErrCode)
 {


[4/4] incubator-weex git commit: Merge branch 'fix-typo' of http://github.com/42Vision/incubator-weex into dev This closes #148

Posted by so...@apache.org.
Merge branch 'fix-typo' of http://github.com/42Vision/incubator-weex into dev
This closes #148


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/014aa818
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/014aa818
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/014aa818

Branch: refs/heads/dev
Commit: 014aa81836c6bf86fe4098276d8a0d7454a1d4c2
Parents: 8fa5c93 27aa747
Author: sospartan <so...@apache.org>
Authored: Thu Mar 23 10:02:48 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Mar 23 10:02:48 2017 +0800

----------------------------------------------------------------------
 doc/source/guide/integrate-to-your-app.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/014aa818/doc/source/guide/integrate-to-your-app.md
----------------------------------------------------------------------


[3/4] incubator-weex git commit: fix a small typo

Posted by so...@apache.org.
fix a small typo


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/27aa7471
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/27aa7471
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/27aa7471

Branch: refs/heads/dev
Commit: 27aa7471dc35d0f753c8b03d2fd87af2c0e15af1
Parents: 66e1b5a
Author: liuxiangyu <li...@palm.science>
Authored: Wed Mar 22 21:01:23 2017 +0800
Committer: liuxiangyu <li...@palm.science>
Committed: Wed Mar 22 21:01:23 2017 +0800

----------------------------------------------------------------------
 doc/source/guide/integrate-to-your-app.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/27aa7471/doc/source/guide/integrate-to-your-app.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/integrate-to-your-app.md b/doc/source/guide/integrate-to-your-app.md
index 7d67d84..490f189 100644
--- a/doc/source/guide/integrate-to-your-app.md
+++ b/doc/source/guide/integrate-to-your-app.md
@@ -12,7 +12,7 @@ version: 2.1
 ## Integrate to Android
 Tip\uff1aThe following documents assume that you already have a certain Android development experience.    
 
-### Android has tow ways to integrate weex
+### Android has two ways to integrate weex
 1.using source code: Can quickly use the latest features of WEEX, according to your own characteristics of the project. So, you can do some related improvements.
 
 2.using SDK: WEEX will regularly release a stable version at jcenter.[jcenter](https://bintray.com/alibabaweex/maven/weex_sdk/view)       
@@ -276,4 +276,4 @@ In the dealloc phase of the viewController destroyed Weex instance, can play a r
 
 #### Import the Weex SDK framework to the project.     
 The Weex SDK can be compiled from the source code. You can try the latest feature in the new feature or bugfix branch.        
-Refer to [here](https://open.taobao.com/doc2/detail?spm=a219a.7629140.0.0.tFddsV&&docType=1&articleId=104829) for direct import of weexSDK.
\ No newline at end of file
+Refer to [here](https://open.taobao.com/doc2/detail?spm=a219a.7629140.0.0.tFddsV&&docType=1&articleId=104829) for direct import of weexSDK.


[2/4] incubator-weex git commit: Merge branch 'fix-capital-error' of https://github.com/lforme/incubator-weex

Posted by so...@apache.org.
Merge branch 'fix-capital-error' of https://github.com/lforme/incubator-weex


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/66e1b5a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/66e1b5a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/66e1b5a3

Branch: refs/heads/dev
Commit: 66e1b5a395c91ee98ba039e335f2e92fdcd1cb54
Parents: 2d7b868 56b1df4
Author: cxfeng <cx...@apache.org>
Authored: Thu Mar 16 16:56:21 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Thu Mar 16 16:56:21 2017 +0800

----------------------------------------------------------------------

----------------------------------------------------------------------