mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-16 10:29:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2a2c21bb63
opencv/modules/java/android_test
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
..
.settings Improving compatibility with the latest Android SDK (r21) and NDK (r8c). 2012-11-20 18:40:22 +04:00
res Convert test image to losless format 2013-01-17 20:43:57 +04:00
src/org/opencv/test Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
.classpath Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
.gitignore Normalized file endings. 2013-08-21 18:59:25 +04:00
.project Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
AndroidManifest.xml Converted tabs to spaces. 2013-08-21 18:59:26 +04:00
CMakeLists.txt copying '.classpath' and '.project' to build dir, useful for opening in eclipse 2013-04-05 08:50:08 +04:00