generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2c4bbb313c
opencv/samples/android/face-detection/jni
History
Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4 
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
2013-08-27 13:26:44 +04:00
..
Android.mk Normalized file endings. 2013-08-21 18:59:25 +04:00
Application.mk Improving compatibility with the latest Android SDK (r21) and NDK (r8c). 2012-11-20 18:40:22 +04:00
DetectionBasedTracker_jni.cpp Normalized file endings. 2013-08-21 18:59:25 +04:00
DetectionBasedTracker_jni.h Face detection package name replaced on org.opencv.facedetect for consistency with Google Play package. 2012-11-09 09:40:19 +04:00