mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 03:30:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
786e3b9eee
opencv/modules/java
History
Roman Donchenko db85c35e69 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/basicretinafilter.hpp
	modules/contrib/src/magnoretinafilter.hpp
	modules/contrib/src/parvoretinafilter.hpp
	modules/contrib/src/retinacolor.hpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/highgui/src/cap_tyzx.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/test/test_filters.cpp
	modules/ocl/test/test_objdetect.cpp
2014-03-03 13:45:22 +04:00
..
android_lib Switched OpenCV to a 3-component version number. 2013-11-15 19:41:53 +04:00
android_test added cv::intergal to T-API 2013-12-06 13:18:25 +04:00
generator Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-03 13:45:22 +04:00
test Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-22 14:28:00 +04:00
build.xml.in Fix for encoding errors when building Java source 2013-03-27 17:43:00 +04:00
check-tests.py Normalized file endings. 2013-08-21 18:59:25 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-03 13:23:59 +04:00