mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-11 11:45:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
9218f4976c
opencv/modules/core
History
Roman Donchenko 9218f4976c Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/retina.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuoptflow/src/tvl1flow.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/precomp.hpp
	samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
..
doc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-27 19:15:47 +04:00
include/opencv2 Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix 2013-08-29 16:35:38 +04:00
perf Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-09-02 19:44:51 +04:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-09-02 19:44:51 +04:00
test Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
CMakeLists.txt Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR. 2013-08-22 18:17:19 +04:00