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

Merge branch 2.4

Browse Source 
Conflicts:
	android/service/engine/AndroidManifest.xml - use file from 2.4
	modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
	modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
This commit is contained in:
Andrey Kamaev
2012-11-20 19:12:00 +04:00
parent 2e2d927273 d559c18ee5
commit 7f542e391a
39 changed files with 462 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
samples/android/color-blob-detection/.settings/org.eclipse.jdt.core.prefs
View File

@@ -1,5 +1,4 @@
#Wed Jun 29 04:36:40 MSD 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.source=1.6