mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 11:40:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
48432502b6
opencv/modules/core
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 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-25 15:02:24 +04:00
include/opencv2 Merge pull request #2356 from SpecLad:merge-2.4 2014-02-18 12:14:57 +04:00
perf Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-25 15:02:24 +04:00
src Merge pull request #2266 from vpisarev:ipp_norm_fix 2014-02-21 19:11:57 +04:00
test disabled 'reshape', 'copyTo' test 2014-02-15 20:17:42 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-25 15:02:24 +04:00