Roman Donchenko 9c83f6c4fb Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	modules/core/include/opencv2/core/version.hpp
	modules/cudacodec/src/ffmpeg_video_source.cpp
	modules/gpu/src/video_writer.cpp
	modules/highgui/test/test_ffmpeg.cpp
	modules/highgui/test/test_video_io.cpp
	modules/highgui/test/test_video_pos.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/blend.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/safe_call.hpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_moments.cpp
	samples/ocl/squares.cpp

2013-11-05 16:38:23 +04:00

..

doc

Merge branch 'master' into merge-2.4

2013-08-16 14:14:12 +04:00

include/opencv2

War on Whitespace, master edition: file endings.

2013-08-27 14:23:26 +04:00

perf

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

2013-08-19 19:02:36 +04:00

src

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

2013-11-05 16:38:23 +04:00

test

Boring changes - video.

2013-09-05 19:02:58 +04:00

CMakeLists.txt

Global CMake reorganization:

2012-02-03 11:26:49 +00:00