mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 22:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4116cbe2c0
opencv/android
History
Andrey Kamaev 7f542e391a Merge branch 2.4 
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
2012-11-20 19:12:00 +04:00
..
libinfo Libinfo build fix; 2012-11-20 17:39:45 +04:00
package Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
scripts Issue #2537 OpenCV Manager doesn't work on Android 4.2 fixed. 2012-11-16 17:01:25 +04:00
service Merge branch 2.4 2012-11-20 19:12:00 +04:00
android.toolchain.cmake Update Android CMake toolchain for NDK r8c 2012-11-20 15:20:04 +04:00
java.rst Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
README.android Updated link to OpenCV for Android page in README.android 2012-11-01 22:28:46 +04:00
refman.rst adding java api ref. to top-level index 2012-07-12 09:21:29 +00:00

README.android 

See http://opencv.org/android