mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 06:10:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
b9d68ef061
opencv/modules/photo
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 2013-12-06 15:20:29 +04:00
include/opencv2 fixed warnings 2013-12-06 15:20:29 +04:00
perf added performance tests for NLMeans 2014-02-11 18:21:53 +04:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-25 15:02:24 +04:00
test Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-17 15:24:05 +04:00
CMakeLists.txt renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00