third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d94f08f0e7
opencv/samples/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
..
15-puzzle Improving compatibility with the latest Android SDK (r21) and NDK (r8c). 2012-11-20 18:40:22 +04:00
color-blob-detection Merge branch 2.4 2012-11-20 19:12:00 +04:00
face-detection Merge branch 2.4 2012-11-20 19:12:00 +04:00
hello-android Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
image-manipulations Improving compatibility with the latest Android SDK (r21) and NDK (r8c). 2012-11-20 18:40:22 +04:00
tutorial-0-androidcamera Improving compatibility with the latest Android SDK (r21) and NDK (r8c). 2012-11-20 18:40:22 +04:00
tutorial-1-addopencv Improving compatibility with the latest Android SDK (r21) and NDK (r8c). 2012-11-20 18:40:22 +04:00
tutorial-2-opencvcamera Improving compatibility with the latest Android SDK (r21) and NDK (r8c). 2012-11-20 18:40:22 +04:00
tutorial-3-native Merge pull request #161 from apavlenko:fix/sdk_r21 2012-11-20 19:07:08 +04:00
tutorial-4-mixed Merge pull request #161 from apavlenko:fix/sdk_r21 2012-11-20 19:07:08 +04:00
.gitignore Add gitignore for Android tests and samples 2012-09-10 15:48:57 +04:00
CMakeLists.txt camera-preview sample removed from CMakeLists.txt 2012-10-23 20:06:58 +04:00