opencv/modules/highgui/test
Vladislav Vinogradov 0c7663eb3b Merge branch 'master' into gpu-cuda-rename
Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp
2013-09-06 15:44:44 +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 Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +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