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

..

test_drawing.cpp

Main module headers are moved 1 level up

2013-03-13 17:26:56 +04:00

test_ffmpeg.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-02-03 13:23:59 +04:00

test_fourcc.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

test_framecount.cpp

Boring changes - highgui.

2013-09-05 18:26:43 +04:00

test_grfmt.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-02-25 15:02:24 +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

deleted excess semicolons, commas

2014-01-18 01:31:33 +04:00

test_precomp.hpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-23 18:50:17 +04:00

test_video_io.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-02-03 13:23:59 +04:00

test_video_pos.cpp

Added stupid hacks to make the video tests pass with FFmpeg 2.0.2.

2013-10-25 14:34:02 +04:00