opencv/modules/highgui/test
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
..
test_drawing.cpp Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
test_ffmpeg.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
test_fourcc.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
test_framecount.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
test_grfmt.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-27 19:15:47 +04:00
test_gui.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
test_main.cpp Normalized file endings. 2013-08-21 18:59:25 +04:00
test_positioning.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
test_precomp.hpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-19 19:02:36 +04:00
test_video_io.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-03 19:53:21 +04:00
test_video_pos.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00