Android samples fixed - line endings are converted to unix style; autogenerated folders are added to ignore list
This commit is contained in:
parent
359b76bdad
commit
3df6548c4a
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>OpenCVJavaAPI</name>
|
||||
<name>OpenCV</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
|
@ -1,11 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.opencv.JavaAPI"
|
||||
package="org.opencv"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0">
|
||||
<application android:label="OpenCVJavaAPI">
|
||||
<activity android:name="OpenCVJavaAPI"
|
||||
android:label="OpenCVJavaAPI">
|
||||
<application android:label="OpenCV">
|
||||
<activity android:name="OpenCV"
|
||||
android:label="OpenCV">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
|
Loading…
x
Reference in New Issue
Block a user