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
2d6f35d6ed
opencv/modules/highgui
History
Roman Donchenko 2d6f35d6ed Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/gpuwarping/src/cuda/resize.cu
	modules/gpuwarping/src/resize.cpp
	modules/gpuwarping/test/test_resize.cpp
	modules/ocl/perf/main.cpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_precomp.cpp
	modules/ocl/perf/perf_precomp.hpp
2013-08-27 19:15:47 +04:00
..
doc Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
include/opencv2 War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
perf Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-27 19:15:47 +04:00
test Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-27 19:15:47 +04:00
CMakeLists.txt Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR. 2013-08-22 18:17:19 +04:00