generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Android samples fixed - line endings are converted to unix style; autogenerated folders are added to ignore list

Browse Source
This commit is contained in:
Andrey Kamaev 2011-06-29 13:42:46 +00:00
parent 359b76bdad
commit 3df6548c4a
6 changed files with 164 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/java/android/.project
View File

@ -1,6 +1,6 @@
<?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>

8
modules/java/android/AndroidManifest.xml
View File

@ -1,11 +1,11 @@
<?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" />