Commit 3df6548c authored by Andrey Kamaev's avatar Andrey Kamaev

Android samples fixed - line endings are converted to unix style; autogenerated…

Android samples fixed - line endings are converted to unix style; autogenerated folders are added to ignore list
parent 359b76bd
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>OpenCVJavaAPI</name> <name>OpenCV</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opencv.JavaAPI" package="org.opencv"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">
<application android:label="OpenCVJavaAPI"> <application android:label="OpenCV">
<activity android:name="OpenCVJavaAPI" <activity android:name="OpenCV"
android:label="OpenCVJavaAPI"> android:label="OpenCV">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment