Merge branch 'master' of https://github.com/Mainvooid/opencv-android-sdk-with-contrib

Mainvooid · Mainvooid · commit 37ff635bbd0b · 2018-04-04T15:36:26.000+08:00
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ opencv341 android sdk with contrib341 module build on windows.
 工作需要，目前主要编译了armeabi-v7a和x86的.so库.a库，主要用于jni编程，附带java应用层函数。
 
 
-## A templet build.gradle for armeabi-v7a with NDK
+## A templet build.gradle for armeabi-v7a and x86 with NDK
 
 ```
 apply plugin: 'com.android.library'
@@ -36,4 +36,4 @@ android {
     }
 }
 ...
-```
+```

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ opencv341 android sdk with contrib341 module build on windows.`
`6`	`6`	`工作需要，目前主要编译了armeabi-v7a和x86的.so库.a库，主要用于jni编程，附带java应用层函数。`
`7`	`7`
`8`	`8`
`9`		`-## A templet build.gradle for armeabi-v7a with NDK`
	`9`	`+## A templet build.gradle for armeabi-v7a and x86 with NDK`
`10`	`10`
`11`	`11`	```
`12`	`12`	`apply plugin: 'com.android.library'`
`@@ -36,4 +36,4 @@ android {`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`...`
`39`		-```
	`39`	+```