mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-23 01:53:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
050cca0422
opencv/modules/nonfree
History
Roman Donchenko 48432502b6 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
	modules/core/CMakeLists.txt
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/highgui/src/grfmt_tiff.cpp
	modules/imgproc/src/clahe.cpp
	modules/imgproc/src/moments.cpp
	modules/nonfree/CMakeLists.txt
	modules/ocl/perf/perf_ml.cpp
	modules/superres/CMakeLists.txt
2014-02-25 15:02:24 +04:00
..
doc fixed warnings from OCL and DOC builders 2014-02-04 21:19:31 +04:00
include/opencv2 Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray 2014-02-06 12:55:04 +04:00
perf Merge pull request #2261 from jet47:stitching-cuda-android 2014-02-03 15:35:55 +04:00
src fix nonfree module compilation without CUDA 2014-02-07 13:40:37 +04:00
test Merge pull request #2261 from jet47:stitching-cuda-android 2014-02-03 15:35:55 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-25 15:02:24 +04:00